X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Ftrack-untrack.cpp;fp=src%2Fbin%2Flttng%2Fcommands%2Ftrack-untrack.cpp;h=b5320f08f1a54dadc9202e8c5f49de1ca80ba19c;hp=e311304f4aa40bf10a491dab12d2b6f41402ab56;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hpb=52e345b9ac912d033c2a2c25a170a01cf209839d diff --git a/src/bin/lttng/commands/track-untrack.cpp b/src/bin/lttng/commands/track-untrack.cpp index e311304f4..b5320f08f 100644 --- a/src/bin/lttng/commands/track-untrack.cpp +++ b/src/bin/lttng/commands/track-untrack.cpp @@ -8,6 +8,16 @@ */ #define _LGPL_SOURCE +#include "../command.hpp" + +#include +#include +#include +#include +#include + +#include + #include #include #include @@ -17,19 +27,8 @@ #include #include #include - #include -#include -#include -#include -#include -#include - -#include - -#include "../command.hpp" - namespace { struct process_attr_command_args { enum lttng_process_attr process_attr; @@ -66,26 +65,130 @@ static char *opt_str_arg; static struct poptOption long_options[] = { /* { longName, shortName, argInfo, argPtr, value, descrip, argDesc, } */ - { "help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0, }, - { "session", 's', POPT_ARG_STRING, &opt_session_name, OPT_SESSION, 0, 0, }, - { "kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0, }, - { "userspace", 'u', POPT_ARG_VAL, &opt_userspace, 1, 0, 0, }, - { "pid", 'p', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_str_arg, OPT_PID, 0, 0, }, - { "vpid", 0, POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_str_arg, OPT_VPID, 0, 0, }, - { "uid", 0, POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_str_arg, OPT_UID, 0, 0, }, - { "vuid", 0, POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_str_arg, OPT_VUID, 0, 0, }, - { "gid", 0, POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_str_arg, OPT_GID, 0, 0, }, - { "vgid", 0, POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_str_arg, OPT_VGID, 0, 0, }, - { "all", 'a', POPT_ARG_NONE, 0, OPT_ALL, 0, 0, }, - { "list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, 0, 0, }, - { 0, 0, 0, 0, 0, 0, 0, }, + { + "help", + 'h', + POPT_ARG_NONE, + 0, + OPT_HELP, + 0, + 0, + }, + { + "session", + 's', + POPT_ARG_STRING, + &opt_session_name, + OPT_SESSION, + 0, + 0, + }, + { + "kernel", + 'k', + POPT_ARG_VAL, + &opt_kernel, + 1, + 0, + 0, + }, + { + "userspace", + 'u', + POPT_ARG_VAL, + &opt_userspace, + 1, + 0, + 0, + }, + { + "pid", + 'p', + POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, + &opt_str_arg, + OPT_PID, + 0, + 0, + }, + { + "vpid", + 0, + POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, + &opt_str_arg, + OPT_VPID, + 0, + 0, + }, + { + "uid", + 0, + POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, + &opt_str_arg, + OPT_UID, + 0, + 0, + }, + { + "vuid", + 0, + POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, + &opt_str_arg, + OPT_VUID, + 0, + 0, + }, + { + "gid", + 0, + POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, + &opt_str_arg, + OPT_GID, + 0, + 0, + }, + { + "vgid", + 0, + POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, + &opt_str_arg, + OPT_VGID, + 0, + 0, + }, + { + "all", + 'a', + POPT_ARG_NONE, + 0, + OPT_ALL, + 0, + 0, + }, + { + "list-options", + 0, + POPT_ARG_NONE, + NULL, + OPT_LIST_OPTIONS, + 0, + 0, + }, + { + 0, + 0, + 0, + 0, + 0, + 0, + 0, + }, }; static struct process_attr_command_args - process_attr_commands[LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID + 1]; + process_attr_commands[LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID + 1]; static void process_attr_command_init(struct process_attr_command_args *cmd, - enum lttng_process_attr process_attr) + enum lttng_process_attr process_attr) { cmd->process_attr = process_attr; cmd->all = false; @@ -133,7 +236,7 @@ static bool ust_process_attr_supported(enum lttng_process_attr *process_attr) break; default: ERR("The %s process attribute cannot be tracked in the user space domain.", - lttng_process_attr_to_string(*process_attr)); + lttng_process_attr_to_string(*process_attr)); supported = false; break; } @@ -153,22 +256,19 @@ static const char *get_mi_element_command(enum cmd_type cmd_type) } static enum cmd_error_code run_command_all(enum cmd_type cmd_type, - const char *session_name, - enum lttng_domain_type domain_type, - enum lttng_process_attr process_attr, - struct mi_writer *writer) + const char *session_name, + enum lttng_domain_type domain_type, + enum lttng_process_attr process_attr, + struct mi_writer *writer) { struct lttng_process_attr_tracker_handle *tracker_handle = NULL; - const enum lttng_error_code handle_ret_code = - lttng_session_get_tracker_handle(session_name, - domain_type, process_attr, - &tracker_handle); + const enum lttng_error_code handle_ret_code = lttng_session_get_tracker_handle( + session_name, domain_type, process_attr, &tracker_handle); enum cmd_error_code cmd_ret = CMD_SUCCESS; enum lttng_process_attr_tracker_handle_status status; if (writer) { - const int ret = mi_lttng_all_process_attribute_value( - writer, process_attr, true); + const int ret = mi_lttng_all_process_attribute_value(writer, process_attr, true); if (ret) { cmd_ret = CMD_FATAL; goto end; @@ -182,18 +282,17 @@ static enum cmd_error_code run_command_all(enum cmd_type cmd_type, } status = lttng_process_attr_tracker_handle_set_tracking_policy( - tracker_handle, - cmd_type == CMD_TRACK ? - LTTNG_TRACKING_POLICY_INCLUDE_ALL : + tracker_handle, + cmd_type == CMD_TRACK ? LTTNG_TRACKING_POLICY_INCLUDE_ALL : LTTNG_TRACKING_POLICY_EXCLUDE_ALL); switch (status) { case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK: if (cmd_type == CMD_TRACK) { MSG("%s tracking policy set to `include all`", - get_capitalized_process_attr_str(process_attr)); + get_capitalized_process_attr_str(process_attr)); } else { MSG("%s tracking policy set to `exclude all`", - get_capitalized_process_attr_str(process_attr)); + get_capitalized_process_attr_str(process_attr)); } break; case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_SESSION_DOES_NOT_EXIST: @@ -201,17 +300,15 @@ static enum cmd_error_code run_command_all(enum cmd_type cmd_type, break; default: ERR("Unknown error encountered while setting tracking policy of %s tracker to `%s`", - lttng_process_attr_to_string(process_attr), - cmd_type == CMD_TRACK ? "include all" : - "exclude all"); + lttng_process_attr_to_string(process_attr), + cmd_type == CMD_TRACK ? "include all" : "exclude all"); cmd_ret = CMD_FATAL; break; } end: if (writer) { - int ret = mi_lttng_writer_write_element_bool(writer, - mi_lttng_element_success, - cmd_ret == CMD_SUCCESS); + int ret = mi_lttng_writer_write_element_bool( + writer, mi_lttng_element_success, cmd_ret == CMD_SUCCESS); if (ret) { cmd_ret = CMD_FATAL; @@ -225,17 +322,15 @@ end: } static enum cmd_error_code run_command_string(enum cmd_type cmd_type, - const char *session_name, - enum lttng_domain_type domain_type, - enum lttng_process_attr process_attr, - const char *_args, - struct mi_writer *writer) + const char *session_name, + enum lttng_domain_type domain_type, + enum lttng_process_attr process_attr, + const char *_args, + struct mi_writer *writer) { struct lttng_process_attr_tracker_handle *tracker_handle = NULL; - const enum lttng_error_code handle_ret_code = - lttng_session_get_tracker_handle(session_name, - domain_type, process_attr, - &tracker_handle); + const enum lttng_error_code handle_ret_code = lttng_session_get_tracker_handle( + session_name, domain_type, process_attr, &tracker_handle); enum cmd_error_code cmd_ret = CMD_SUCCESS; const char *one_value_str; char *args = strdup(_args); @@ -263,15 +358,14 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, if (!policy_set) { status = lttng_process_attr_tracker_handle_get_tracking_policy( - tracker_handle, &policy); + tracker_handle, &policy); if (status != LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK) { break; } if (policy != LTTNG_TRACKING_POLICY_INCLUDE_SET) { status = lttng_process_attr_tracker_handle_set_tracking_policy( - tracker_handle, - LTTNG_TRACKING_POLICY_INCLUDE_SET); + tracker_handle, LTTNG_TRACKING_POLICY_INCLUDE_SET); if (status != LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK) { break; } @@ -280,13 +374,11 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, } if (is_numerical_argument) { - const unsigned long one_value_int = - strtoul(one_value_str, NULL, 10); + const unsigned long one_value_int = strtoul(one_value_str, NULL, 10); if (writer) { ret = mi_lttng_integral_process_attribute_value( - writer, process_attr, - (int64_t) one_value_int, true); + writer, process_attr, (int64_t) one_value_int, true); if (ret) { cmd_ret = CMD_FATAL; goto end; @@ -296,57 +388,45 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, switch (process_attr) { case LTTNG_PROCESS_ATTR_PROCESS_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_process_id_tracker_handle_add_pid( - tracker_handle, - (pid_t) one_value_int) : - lttng_process_attr_process_id_tracker_handle_remove_pid( - tracker_handle, - (pid_t) one_value_int); + lttng_process_attr_process_id_tracker_handle_add_pid( + tracker_handle, (pid_t) one_value_int) : + lttng_process_attr_process_id_tracker_handle_remove_pid( + tracker_handle, (pid_t) one_value_int); break; case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_virtual_process_id_tracker_handle_add_pid( - tracker_handle, - (pid_t) one_value_int) : - lttng_process_attr_virtual_process_id_tracker_handle_remove_pid( - tracker_handle, - (pid_t) one_value_int); + lttng_process_attr_virtual_process_id_tracker_handle_add_pid( + tracker_handle, (pid_t) one_value_int) : + lttng_process_attr_virtual_process_id_tracker_handle_remove_pid( + tracker_handle, (pid_t) one_value_int); break; case LTTNG_PROCESS_ATTR_USER_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_user_id_tracker_handle_add_uid( - tracker_handle, - (uid_t) one_value_int) : - lttng_process_attr_user_id_tracker_handle_remove_uid( - tracker_handle, - (uid_t) one_value_int); + lttng_process_attr_user_id_tracker_handle_add_uid( + tracker_handle, (uid_t) one_value_int) : + lttng_process_attr_user_id_tracker_handle_remove_uid( + tracker_handle, (uid_t) one_value_int); break; case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_virtual_user_id_tracker_handle_add_uid( - tracker_handle, - (uid_t) one_value_int) : - lttng_process_attr_virtual_user_id_tracker_handle_remove_uid( - tracker_handle, - (uid_t) one_value_int); + lttng_process_attr_virtual_user_id_tracker_handle_add_uid( + tracker_handle, (uid_t) one_value_int) : + lttng_process_attr_virtual_user_id_tracker_handle_remove_uid( + tracker_handle, (uid_t) one_value_int); break; case LTTNG_PROCESS_ATTR_GROUP_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_group_id_tracker_handle_add_gid( - tracker_handle, - (gid_t) one_value_int) : - lttng_process_attr_group_id_tracker_handle_remove_gid( - tracker_handle, - (gid_t) one_value_int); + lttng_process_attr_group_id_tracker_handle_add_gid( + tracker_handle, (gid_t) one_value_int) : + lttng_process_attr_group_id_tracker_handle_remove_gid( + tracker_handle, (gid_t) one_value_int); break; case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_virtual_group_id_tracker_handle_add_gid( - tracker_handle, - (gid_t) one_value_int) : - lttng_process_attr_virtual_group_id_tracker_handle_remove_gid( - tracker_handle, - (gid_t) one_value_int); + lttng_process_attr_virtual_group_id_tracker_handle_add_gid( + tracker_handle, (gid_t) one_value_int) : + lttng_process_attr_virtual_group_id_tracker_handle_remove_gid( + tracker_handle, (gid_t) one_value_int); break; default: abort(); @@ -355,8 +435,7 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, } else { if (writer) { ret = mi_lttng_string_process_attribute_value( - writer, process_attr, - one_value_str, true); + writer, process_attr, one_value_str, true); if (ret) { cmd_ret = CMD_FATAL; goto end; @@ -366,53 +445,43 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, switch (process_attr) { case LTTNG_PROCESS_ATTR_USER_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_user_id_tracker_handle_add_user_name( - tracker_handle, - one_value_str) : - lttng_process_attr_user_id_tracker_handle_remove_user_name( - tracker_handle, - one_value_str); + lttng_process_attr_user_id_tracker_handle_add_user_name( + tracker_handle, one_value_str) : + lttng_process_attr_user_id_tracker_handle_remove_user_name( + tracker_handle, one_value_str); break; case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_virtual_user_id_tracker_handle_add_user_name( - tracker_handle, - one_value_str) : - lttng_process_attr_virtual_user_id_tracker_handle_remove_user_name( - tracker_handle, - one_value_str); + lttng_process_attr_virtual_user_id_tracker_handle_add_user_name( + tracker_handle, one_value_str) : + lttng_process_attr_virtual_user_id_tracker_handle_remove_user_name( + tracker_handle, one_value_str); break; case LTTNG_PROCESS_ATTR_GROUP_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_group_id_tracker_handle_add_group_name( - tracker_handle, - one_value_str) : - lttng_process_attr_group_id_tracker_handle_remove_group_name( - tracker_handle, - one_value_str); + lttng_process_attr_group_id_tracker_handle_add_group_name( + tracker_handle, one_value_str) : + lttng_process_attr_group_id_tracker_handle_remove_group_name( + tracker_handle, one_value_str); break; case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID: status = cmd_type == CMD_TRACK ? - lttng_process_attr_virtual_group_id_tracker_handle_add_group_name( - tracker_handle, - one_value_str) : - lttng_process_attr_virtual_group_id_tracker_handle_remove_group_name( - tracker_handle, - one_value_str); + lttng_process_attr_virtual_group_id_tracker_handle_add_group_name( + tracker_handle, one_value_str) : + lttng_process_attr_virtual_group_id_tracker_handle_remove_group_name( + tracker_handle, one_value_str); break; default: ERR("%s is not a valid %s value; expected an integer", - one_value_str, - lttng_process_attr_to_string( - process_attr)); + one_value_str, + lttng_process_attr_to_string(process_attr)); cmd_ret = CMD_FATAL; goto end; } } - ret = asprintf(&prettified_arg, - is_numerical_argument ? "%s" : "`%s`", - one_value_str); + ret = asprintf( + &prettified_arg, is_numerical_argument ? "%s" : "`%s`", one_value_str); if (ret < 0) { PERROR("Failed to format argument `%s`", one_value_str); cmd_ret = CMD_FATAL; @@ -423,14 +492,12 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK: if (cmd_type == CMD_TRACK) { MSG("Added %s to the %s tracker inclusion set", - one_value_str, - lttng_process_attr_to_string( - process_attr)); + one_value_str, + lttng_process_attr_to_string(process_attr)); } else { MSG("Removed %s from the %s tracker inclusion set", - one_value_str, - lttng_process_attr_to_string( - process_attr)); + one_value_str, + lttng_process_attr_to_string(process_attr)); } break; case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_SESSION_DOES_NOT_EXIST: @@ -438,15 +505,13 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, break; case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_EXISTS: WARN("%s is already in the %s inclusion set", - prettified_arg, - lttng_process_attr_to_string( - process_attr)); + prettified_arg, + lttng_process_attr_to_string(process_attr)); break; case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_MISSING: WARN("%s is not in the %s the inclusion set", - prettified_arg, - lttng_process_attr_to_string( - process_attr)); + prettified_arg, + lttng_process_attr_to_string(process_attr)); break; case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_USER_NOT_FOUND: ERR("User %s was not found", prettified_arg); @@ -458,21 +523,18 @@ static enum cmd_error_code run_command_string(enum cmd_type cmd_type, break; default: ERR("Unknown error encountered while %s %s %s %s tracker's inclusion set", - cmd_type == CMD_TRACK ? "adding" : - "removing", - lttng_process_attr_to_string( - process_attr), - prettified_arg, - cmd_type == CMD_TRACK ? "to" : "from"); + cmd_type == CMD_TRACK ? "adding" : "removing", + lttng_process_attr_to_string(process_attr), + prettified_arg, + cmd_type == CMD_TRACK ? "to" : "from"); cmd_ret = CMD_FATAL; break; } free(prettified_arg); if (writer) { - ret = mi_lttng_writer_write_element_bool(writer, - mi_lttng_element_success, - cmd_ret == CMD_SUCCESS); + ret = mi_lttng_writer_write_element_bool( + writer, mi_lttng_element_success, cmd_ret == CMD_SUCCESS); if (ret) { cmd_ret = CMD_FATAL; @@ -489,17 +551,16 @@ end: } static enum cmd_error_code run_command(enum cmd_type cmd_type, - const char *session_name, - const struct process_attr_command_args *command_args, - struct mi_writer *writer) + const char *session_name, + const struct process_attr_command_args *command_args, + struct mi_writer *writer) { - const enum lttng_domain_type domain_type = - opt_kernel ? LTTNG_DOMAIN_KERNEL : LTTNG_DOMAIN_UST; + const enum lttng_domain_type domain_type = opt_kernel ? LTTNG_DOMAIN_KERNEL : + LTTNG_DOMAIN_UST; enum cmd_error_code cmd_ret = CMD_SUCCESS; unsigned int i; const unsigned int string_arg_count = - lttng_dynamic_pointer_array_get_count( - &command_args->string_args); + lttng_dynamic_pointer_array_get_count(&command_args->string_args); enum lttng_process_attr process_attr = command_args->process_attr; if (opt_userspace) { @@ -516,8 +577,7 @@ static enum cmd_error_code run_command(enum cmd_type cmd_type, if (writer) { /* Open tracker and trackers elements */ - const int ret = mi_lttng_process_attribute_tracker_open( - writer, process_attr); + const int ret = mi_lttng_process_attribute_tracker_open(writer, process_attr); if (ret) { cmd_ret = CMD_FATAL; goto end; @@ -525,17 +585,17 @@ static enum cmd_error_code run_command(enum cmd_type cmd_type, } if (command_args->all) { - cmd_ret = run_command_all(cmd_type, session_name, domain_type, - process_attr, writer); + cmd_ret = + run_command_all(cmd_type, session_name, domain_type, process_attr, writer); } else { bool error_occurred = false; for (i = 0; i < string_arg_count; i++) { const char *arg = (const char *) lttng_dynamic_pointer_array_get_pointer( - &command_args->string_args, i); + &command_args->string_args, i); - cmd_ret = run_command_string(cmd_type, session_name, - domain_type, process_attr, arg, writer); + cmd_ret = run_command_string( + cmd_type, session_name, domain_type, process_attr, arg, writer); if (cmd_ret != CMD_SUCCESS) { error_occurred = true; if (cmd_ret == CMD_FATAL) { @@ -551,8 +611,7 @@ static enum cmd_error_code run_command(enum cmd_type cmd_type, if (writer) { /* Close tracker and trackers elements */ - const int ret = mi_lttng_close_multi_element( - writer, 2); + const int ret = mi_lttng_close_multi_element(writer, 2); if (ret) { cmd_ret = CMD_FATAL; goto end; @@ -566,17 +625,16 @@ end: * Add/remove tracker to/from session. */ static int cmd_track_untrack(enum cmd_type cmd_type, - int argc, - const char **argv, - const char *help_msg __attribute__((unused))) + int argc, + const char **argv, + const char *help_msg __attribute__((unused))) { int opt, ret = 0; bool sub_command_failed = false; bool opt_all = false; unsigned int selected_process_attr_tracker_count = 0; const unsigned int command_count = - sizeof(process_attr_commands) / - sizeof(struct process_attr_command_args); + sizeof(process_attr_commands) / sizeof(struct process_attr_command_args); enum cmd_error_code command_ret = CMD_SUCCESS; static poptContext pc; char *session_name = NULL; @@ -620,8 +678,7 @@ static int cmd_track_untrack(enum cmd_type cmd_type, continue; } ret = lttng_dynamic_pointer_array_add_pointer( - &process_attr_commands[opt].string_args, - opt_str_arg); + &process_attr_commands[opt].string_args, opt_str_arg); if (ret) { ERR("Allocation failed while parsing command arguments"); command_ret = CMD_ERROR; @@ -637,8 +694,7 @@ static int cmd_track_untrack(enum cmd_type cmd_type, } } - ret = print_missing_or_multiple_domains( - opt_kernel + opt_userspace, false); + ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace, false); if (ret) { command_ret = CMD_ERROR; goto end; @@ -660,8 +716,7 @@ static int cmd_track_untrack(enum cmd_type cmd_type, } process_attr_commands[i].all = true; if (lttng_dynamic_pointer_array_get_count( - &process_attr_commands[i] - .string_args)) { + &process_attr_commands[i].string_args)) { ERR("The --all option cannot be used with a list of process attribute values"); command_ret = CMD_ERROR; goto end; @@ -673,12 +728,10 @@ static int cmd_track_untrack(enum cmd_type cmd_type, continue; } if (lttng_dynamic_pointer_array_get_count( - &process_attr_commands[i] - .string_args) == 0) { + &process_attr_commands[i].string_args) == 0) { ERR("No process attribute value specified for %s tracker", - get_capitalized_process_attr_str( - process_attr_commands[i] - .process_attr)); + get_capitalized_process_attr_str( + process_attr_commands[i].process_attr)); command_ret = CMD_ERROR; goto end; } @@ -713,16 +766,14 @@ static int cmd_track_untrack(enum cmd_type cmd_type, if (writer) { /* Open command element */ - ret = mi_lttng_writer_command_open(writer, - get_mi_element_command(cmd_type)); + ret = mi_lttng_writer_command_open(writer, get_mi_element_command(cmd_type)); if (ret) { command_ret = CMD_ERROR; goto end; } /* Open output element */ - ret = mi_lttng_writer_open_element(writer, - mi_lttng_element_command_output); + ret = mi_lttng_writer_open_element(writer, mi_lttng_element_command_output); if (ret) { command_ret = CMD_ERROR; goto end; @@ -739,8 +790,8 @@ static int cmd_track_untrack(enum cmd_type cmd_type, if (!process_attr_commands[i].requested) { continue; } - command_ret = run_command(cmd_type, session_name, - &process_attr_commands[i], writer); + command_ret = + run_command(cmd_type, session_name, &process_attr_commands[i], writer); if (command_ret != CMD_SUCCESS) { sub_command_failed = true; if (command_ret == CMD_FATAL) { @@ -759,9 +810,8 @@ static int cmd_track_untrack(enum cmd_type cmd_type, } /* Success ? */ - ret = mi_lttng_writer_write_element_bool(writer, - mi_lttng_element_command_success, - !sub_command_failed); + ret = mi_lttng_writer_write_element_bool( + writer, mi_lttng_element_command_success, !sub_command_failed); if (ret) { command_ret = CMD_ERROR; goto end; @@ -800,9 +850,9 @@ int cmd_track(int argc, const char **argv) #ifdef LTTNG_EMBED_HELP #include #else - NULL + NULL #endif - ; + ; return cmd_track_untrack(CMD_TRACK, argc, argv, help_msg); } @@ -813,9 +863,9 @@ int cmd_untrack(int argc, const char **argv) #ifdef LTTNG_EMBED_HELP #include #else - NULL + NULL #endif - ; + ; return cmd_track_untrack(CMD_UNTRACK, argc, argv, help_msg); }