X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=34a9c8aa0d612e7dc49ea78d9f0dbfa9d762230e;hp=51434a3eb37982c4d613775b293df7b897242333;hb=1004b7191b421c7c07acf964d0110d93bb022699;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index 51434a3eb..34a9c8aa0 100644 --- a/src/bin/lttng/commands/list.c +++ b/src/bin/lttng/commands/list.c @@ -1,10 +1,12 @@ /* * Copyright (C) 2011 David Goulet + * Copyright (C) 2020 Jérémie Galarneau * * SPDX-License-Identifier: GPL-2.0-only * */ +#include #define _LGPL_SOURCE #include #include @@ -15,8 +17,9 @@ #include #include -#include -#include +#include +#include +#include #include "../command.h" @@ -46,11 +49,11 @@ enum { OPT_LIST_OPTIONS, }; -static struct lttng_handle *handle; -static struct mi_writer *writer; +static struct lttng_handle *the_handle; +static struct mi_writer *the_writer; /* Only set when listing a single session. */ -static struct lttng_session listed_session; +static struct lttng_session the_listed_session; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ @@ -270,7 +273,7 @@ static void print_userspace_probe_location(struct lttng_event *event) case LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION: { const char *function_name; - const char *binary_path; + char *binary_path; MSG("%sType: Function", indent8); function_name = lttng_userspace_probe_location_function_get_function_name(location); @@ -289,12 +292,14 @@ static void print_userspace_probe_location(struct lttng_event *event) MSG("%sLookup method: INVALID LOOKUP TYPE ENCOUNTERED", indent8); break; } + + free(binary_path); break; } case LTTNG_USERSPACE_PROBE_LOCATION_TYPE_TRACEPOINT: { const char *probe_name, *provider_name; - const char *binary_path; + char *binary_path; MSG("%sType: Tracepoint", indent8); probe_name = lttng_userspace_probe_location_tracepoint_get_probe_name(location); @@ -310,6 +315,8 @@ static void print_userspace_probe_location(struct lttng_event *event) MSG("%sLookup method: INVALID LOOKUP TYPE ENCOUNTERED", indent8); break; } + + free(binary_path); break; } default: @@ -352,14 +359,16 @@ static void print_events(struct lttng_event *event) { if (event->loglevel != -1) { MSG("%s%s (loglevel%s %s (%d)) (type: tracepoint)%s%s%s", - indent6, - event->name, - logleveltype_string(event->loglevel_type), - mi_lttng_loglevel_string(event->loglevel, handle->domain.type), - event->loglevel, - enabled_string(event->enabled), - safe_string(exclusion_msg), - safe_string(filter_msg)); + indent6, event->name, + logleveltype_string( + event->loglevel_type), + mi_lttng_loglevel_string( + event->loglevel, + the_handle->domain.type), + event->loglevel, + enabled_string(event->enabled), + safe_string(exclusion_msg), + safe_string(filter_msg)); } else { MSG("%s%s (type: tracepoint)%s%s%s", indent6, @@ -467,19 +476,19 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count, int pid_element_open = 0; /* Open domains element */ - ret = mi_lttng_domains_open(writer); + ret = mi_lttng_domains_open(the_writer); if (ret) { goto end; } /* Write domain */ - ret = mi_lttng_domain(writer, domain, 1); + ret = mi_lttng_domain(the_writer, domain, 1); if (ret) { goto end; } /* Open pids element element */ - ret = mi_lttng_pids_open(writer); + ret = mi_lttng_pids_open(the_writer); if (ret) { goto end; } @@ -488,7 +497,8 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count, if (cur_pid != events[i].pid) { if (pid_element_open) { /* Close the previous events and pid element */ - ret = mi_lttng_close_multi_element(writer, 2); + ret = mi_lttng_close_multi_element( + the_writer, 2); if (ret) { goto end; } @@ -504,13 +514,14 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count, if (!pid_element_open) { /* Open and write a pid element */ - ret = mi_lttng_pid(writer, cur_pid, cmdline, 1); + ret = mi_lttng_pid(the_writer, cur_pid, cmdline, + 1); if (ret) { goto error; } /* Open events element */ - ret = mi_lttng_events_open(writer); + ret = mi_lttng_events_open(the_writer); if (ret) { goto error; } @@ -521,20 +532,21 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count, } /* Write an event */ - ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + ret = mi_lttng_event(the_writer, &events[i], 0, + the_handle->domain.type); if (ret) { goto end; } } /* Close pids */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { goto end; } /* Close domain, domains */ - ret = mi_lttng_close_multi_element(writer, 2); + ret = mi_lttng_close_multi_element(the_writer, 2); end: return ret; error: @@ -565,7 +577,7 @@ static int list_agent_events(void) goto error; } - agent_domain_str = get_domain_str(domain.type); + agent_domain_str = lttng_domain_type_str(domain.type); DBG("Getting %s tracing events", agent_domain_str); @@ -706,19 +718,19 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, memset(&cur_event, 0, sizeof(cur_event)); /* Open domains element */ - ret = mi_lttng_domains_open(writer); + ret = mi_lttng_domains_open(the_writer); if (ret) { goto end; } /* Write domain */ - ret = mi_lttng_domain(writer, domain, 1); + ret = mi_lttng_domain(the_writer, domain, 1); if (ret) { goto end; } /* Open pids element */ - ret = mi_lttng_pids_open(writer); + ret = mi_lttng_pids_open(the_writer); if (ret) { goto end; } @@ -728,14 +740,16 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, if (pid_element_open) { if (event_element_open) { /* Close the previous field element and event. */ - ret = mi_lttng_close_multi_element(writer, 2); + ret = mi_lttng_close_multi_element( + the_writer, 2); if (ret) { goto end; } event_element_open = 0; } /* Close the previous events, pid element */ - ret = mi_lttng_close_multi_element(writer, 2); + ret = mi_lttng_close_multi_element( + the_writer, 2); if (ret) { goto end; } @@ -746,13 +760,14 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, cmdline = get_cmdline_by_pid(cur_pid); if (!pid_element_open) { /* Open and write a pid element */ - ret = mi_lttng_pid(writer, cur_pid, cmdline, 1); + ret = mi_lttng_pid(the_writer, cur_pid, cmdline, + 1); if (ret) { goto error; } /* Open events element */ - ret = mi_lttng_events_open(writer); + ret = mi_lttng_events_open(the_writer); if (ret) { goto error; } @@ -766,7 +781,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, if (strcmp(cur_event.name, fields[i].event.name) != 0) { if (event_element_open) { /* Close the previous fields element and the previous event */ - ret = mi_lttng_close_multi_element(writer, 2); + ret = mi_lttng_close_multi_element( + the_writer, 2); if (ret) { goto end; } @@ -778,14 +794,14 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, if (!event_element_open) { /* Open and write the event */ - ret = mi_lttng_event(writer, &cur_event, 1, - handle->domain.type); + ret = mi_lttng_event(the_writer, &cur_event, 1, + the_handle->domain.type); if (ret) { goto end; } /* Open a fields element */ - ret = mi_lttng_event_fields_open(writer); + ret = mi_lttng_event_fields_open(the_writer); if (ret) { goto end; } @@ -794,14 +810,14 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, } /* Print the event_field */ - ret = mi_lttng_event_field(writer, &fields[i]); + ret = mi_lttng_event_field(the_writer, &fields[i]); if (ret) { goto end; } } /* Close pids, domain, domains */ - ret = mi_lttng_close_multi_element(writer, 3); + ret = mi_lttng_close_multi_element(the_writer, 3); end: return ret; error: @@ -899,32 +915,33 @@ static int mi_list_kernel_events(struct lttng_event *events, int count, int ret, i; /* Open domains element */ - ret = mi_lttng_domains_open(writer); + ret = mi_lttng_domains_open(the_writer); if (ret) { goto end; } /* Write domain */ - ret = mi_lttng_domain(writer, domain, 1); + ret = mi_lttng_domain(the_writer, domain, 1); if (ret) { goto end; } /* Open events */ - ret = mi_lttng_events_open(writer); + ret = mi_lttng_events_open(the_writer); if (ret) { goto end; } for (i = 0; i < count; i++) { - ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + ret = mi_lttng_event(the_writer, &events[i], 0, + the_handle->domain.type); if (ret) { goto end; } } /* close events, domain and domains */ - ret = mi_lttng_close_multi_element(writer, 3); + ret = mi_lttng_close_multi_element(the_writer, 3); if (ret) { goto end; } @@ -999,20 +1016,21 @@ static int mi_list_syscalls(struct lttng_event *events, int count) int ret, i; /* Open events */ - ret = mi_lttng_events_open(writer); + ret = mi_lttng_events_open(the_writer); if (ret) { goto end; } for (i = 0; i < count; i++) { - ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + ret = mi_lttng_event(the_writer, &events[i], 0, + the_handle->domain.type); if (ret) { goto end; } } /* Close events. */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { goto end; } @@ -1072,20 +1090,21 @@ static int mi_list_session_agent_events(struct lttng_event *events, int count) int ret, i; /* Open events element */ - ret = mi_lttng_events_open(writer); + ret = mi_lttng_events_open(the_writer); if (ret) { goto end; } for (i = 0; i < count; i++) { - ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + ret = mi_lttng_event(the_writer, &events[i], 0, + the_handle->domain.type); if (ret) { goto end; } } /* Close events element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); end: return ret; @@ -1101,7 +1120,7 @@ static int list_session_agent_events(void) int ret = CMD_SUCCESS, count, i; struct lttng_event *events = NULL; - count = lttng_list_events(handle, "", &events); + count = lttng_list_events(the_handle, "", &events); if (count < 0) { ret = CMD_ERROR; ERR("%s", lttng_strerror(count)); @@ -1150,10 +1169,11 @@ static int list_session_agent_events(void) event->name, enabled_string(event->enabled), logleveltype_string( - event->loglevel_type), + event->loglevel_type), mi_lttng_loglevel_string( - event->loglevel, - handle->domain.type), + event->loglevel, + the_handle->domain + .type), safe_string(filter_msg)); } else { MSG("%s- %s%s%s", indent4, event->name, @@ -1181,20 +1201,21 @@ static int mi_list_events(struct lttng_event *events, int count) int ret, i; /* Open events element */ - ret = mi_lttng_events_open(writer); + ret = mi_lttng_events_open(the_writer); if (ret) { goto end; } for (i = 0; i < count; i++) { - ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + ret = mi_lttng_event(the_writer, &events[i], 0, + the_handle->domain.type); if (ret) { goto end; } } /* Close events element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); end: return ret; @@ -1208,7 +1229,7 @@ static int list_events(const char *channel_name) int ret = CMD_SUCCESS, count, i; struct lttng_event *events = NULL; - count = lttng_list_events(handle, channel_name, &events); + count = lttng_list_events(the_handle, channel_name, &events); if (count < 0) { ret = CMD_ERROR; ERR("%s", lttng_strerror(count)); @@ -1224,7 +1245,7 @@ static int list_events(const char *channel_name) } } else { /* Pretty print */ - MSG("\n%sEvent rules:", indent4); + MSG("\n%sRecording event rules:", indent4); if (count == 0) { MSG("%sNone\n", indent6); goto end; @@ -1334,7 +1355,7 @@ static void print_channel(struct lttng_channel *channel) } MSG("\n%sStatistics:", indent4); - if (listed_session.snapshot_mode) { + if (the_listed_session.snapshot_mode) { /* * The lost packet count is omitted for sessions in snapshot * mode as it is misleading: it would indicate the number of @@ -1373,7 +1394,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count, unsigned int chan_found = 0; /* Open channels element */ - ret = mi_lttng_channels_open(writer); + ret = mi_lttng_channels_open(the_writer); if (ret) { goto error; } @@ -1388,7 +1409,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count, } /* Write channel element and leave it open */ - ret = mi_lttng_channel(writer, &channels[i], 1); + ret = mi_lttng_channel(the_writer, &channels[i], 1); if (ret) { goto error; } @@ -1400,7 +1421,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count, } /* Closing the channel element we opened earlier */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { goto error; } @@ -1411,7 +1432,7 @@ static int mi_list_channels(struct lttng_channel *channels, int count, } /* Close channels element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { goto error; } @@ -1433,7 +1454,7 @@ static int list_channels(const char *channel_name) DBG("Listing channel(s) (%s)", channel_name ? : ""); - count = lttng_list_channels(handle, &channels); + count = lttng_list_channels(the_handle, &channels); if (count < 0) { switch (-count) { case LTTNG_ERR_KERN_CHAN_NOT_FOUND: @@ -1443,7 +1464,6 @@ static int list_channels(const char *channel_name) count = 0; } else { ret = CMD_SUCCESS; - WARN("No kernel channel"); goto error_channels; } break; @@ -1503,140 +1523,273 @@ error_channels: return ret; } -static const char *get_tracker_str(enum lttng_tracker_type tracker_type) +static const char *get_capitalized_process_attr_str(enum lttng_process_attr process_attr) { - switch (tracker_type) { - case LTTNG_TRACKER_PID: - return "PID"; - case LTTNG_TRACKER_VPID: - return "VPID"; - case LTTNG_TRACKER_UID: - return "UID"; - case LTTNG_TRACKER_VUID: - return "VUID"; - case LTTNG_TRACKER_GID: - return "GID"; - case LTTNG_TRACKER_VGID: - return "VGID"; + switch (process_attr) { + case LTTNG_PROCESS_ATTR_PROCESS_ID: + return "Process ID"; + case LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID: + return "Virtual process ID"; + case LTTNG_PROCESS_ATTR_USER_ID: + return "User ID"; + case LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID: + return "Virtual user ID"; + case LTTNG_PROCESS_ATTR_GROUP_ID: + return "Group ID"; + case LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID: + return "Virtual group ID"; + default: + return "Unknown"; } return NULL; } +static int handle_process_attr_status(enum lttng_process_attr process_attr, + enum lttng_process_attr_tracker_handle_status status) +{ + int ret = CMD_SUCCESS; + + switch (status) { + case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_INVALID_TRACKING_POLICY: + case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_OK: + /* Carry on. */ + break; + case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_COMMUNICATION_ERROR: + ERR("Communication occurred while fetching %s tracker", + lttng_process_attr_to_string(process_attr)); + ret = CMD_ERROR; + break; + case LTTNG_PROCESS_ATTR_TRACKER_HANDLE_STATUS_SESSION_DOES_NOT_EXIST: + ERR("Failed to get the inclusion set of the %s tracker: session `%s` no longer exists", + lttng_process_attr_to_string(process_attr), + the_handle->session_name); + ret = CMD_ERROR; + break; + default: + ERR("Unknown error occurred while fetching the inclusion set of the %s tracker", + lttng_process_attr_to_string(process_attr)); + ret = CMD_ERROR; + break; + } + + return ret; +} + +static int mi_output_empty_tracker(enum lttng_process_attr process_attr) +{ + int ret; + + ret = mi_lttng_process_attribute_tracker_open(the_writer, process_attr); + if (ret) { + goto end; + } + + ret = mi_lttng_close_multi_element(the_writer, 2); +end: + return ret; +} + +static inline bool is_value_type_name( + enum lttng_process_attr_value_type value_type) +{ + return value_type == LTTNG_PROCESS_ATTR_VALUE_TYPE_USER_NAME || + value_type == LTTNG_PROCESS_ATTR_VALUE_TYPE_GROUP_NAME; +} + /* - * List tracker ID(s) of session and domain. + * List a process attribute tracker for a session and domain tuple. */ -static int list_tracker_ids(enum lttng_tracker_type tracker_type) +static int list_process_attr_tracker(enum lttng_process_attr process_attr) { int ret = 0; - int enabled = 1; - struct lttng_tracker_ids *ids = NULL; - unsigned int nr_ids, i; - const struct lttng_tracker_id *id; - enum lttng_tracker_id_status status; + unsigned int count, i; + enum lttng_tracking_policy policy; + enum lttng_error_code ret_code; + enum lttng_process_attr_tracker_handle_status handle_status; + enum lttng_process_attr_values_status values_status; + const struct lttng_process_attr_values *values; + struct lttng_process_attr_tracker_handle *tracker_handle = NULL; + + ret_code = lttng_session_get_tracker_handle(the_handle->session_name, + the_handle->domain.type, process_attr, &tracker_handle); + if (ret_code != LTTNG_OK) { + ERR("Failed to get process attribute tracker handle: %s", + lttng_strerror(ret_code)); + ret = CMD_ERROR; + goto end; + } - ret = lttng_list_tracker_ids(handle, tracker_type, &ids); - if (ret) { - return ret; + handle_status = lttng_process_attr_tracker_handle_get_inclusion_set( + tracker_handle, &values); + ret = handle_process_attr_status(process_attr, handle_status); + if (ret != CMD_SUCCESS) { + goto end; } - status = lttng_tracker_ids_get_count(ids, &nr_ids); - if (status != LTTNG_TRACKER_ID_STATUS_OK) { - ret = CMD_ERROR; + handle_status = lttng_process_attr_tracker_handle_get_tracking_policy( + tracker_handle, &policy); + ret = handle_process_attr_status(process_attr, handle_status); + if (ret != CMD_SUCCESS) { goto end; } - if (nr_ids == 1) { - id = lttng_tracker_ids_get_at_index(ids, 0); - if (id && lttng_tracker_id_get_type(id) == LTTNG_ID_ALL) { - enabled = 0; + { + char *process_attr_name; + const int print_ret = asprintf(&process_attr_name, "%ss:", + get_capitalized_process_attr_str(process_attr)); + + if (print_ret == -1) { + ret = CMD_FATAL; + goto end; } + _MSG(" %-22s", process_attr_name); + free(process_attr_name); + } + switch (policy) { + case LTTNG_TRACKING_POLICY_INCLUDE_SET: + break; + case LTTNG_TRACKING_POLICY_EXCLUDE_ALL: + if (the_writer) { + mi_output_empty_tracker(process_attr); + } + MSG("none"); + ret = CMD_SUCCESS; + goto end; + case LTTNG_TRACKING_POLICY_INCLUDE_ALL: + MSG("all"); + ret = CMD_SUCCESS; + goto end; + default: + ERR("Unknown tracking policy encoutered while listing the %s process attribute tracker of session `%s`", + lttng_process_attr_to_string(process_attr), + the_handle->session_name); + ret = CMD_FATAL; + goto end; } - if (enabled) { - _MSG("%s tracker: [", get_tracker_str(tracker_type)); + values_status = lttng_process_attr_values_get_count(values, &count); + if (values_status != LTTNG_PROCESS_ATTR_VALUES_STATUS_OK) { + ERR("Failed to get the count of values in the inclusion set of the %s process attribute tracker of session `%s`", + lttng_process_attr_to_string(process_attr), + the_handle->session_name); + ret = CMD_FATAL; + goto end; + } - /* Mi tracker_id element */ - if (writer) { - /* Open tracker_id and targets elements */ - ret = mi_lttng_id_tracker_open(writer, tracker_type); - if (ret) { - goto end; - } + if (count == 0) { + /* Functionally equivalent to the 'exclude all' policy. */ + if (the_writer) { + mi_output_empty_tracker(process_attr); } + MSG("none"); + ret = CMD_SUCCESS; + goto end; + } - for (i = 0; i < nr_ids; i++) { - enum lttng_tracker_id_status status = - LTTNG_TRACKER_ID_STATUS_OK; - int value; - const char *value_string; + /* Mi tracker_id element */ + if (the_writer) { + /* Open tracker_id and targets elements */ + ret = mi_lttng_process_attribute_tracker_open( + the_writer, process_attr); + if (ret) { + goto end; + } + } - id = lttng_tracker_ids_get_at_index(ids, i); - if (!id) { - ret = CMD_ERROR; - goto end; - } + for (i = 0; i < count; i++) { + const enum lttng_process_attr_value_type value_type = + lttng_process_attr_values_get_type_at_index( + values, i); + int64_t integral_value = INT64_MAX; + const char *name = "error"; + + if (i >= 1) { + _MSG(", "); + } + switch (value_type) { + case LTTNG_PROCESS_ATTR_VALUE_TYPE_PID: + { + pid_t pid; + + values_status = lttng_process_attr_values_get_pid_at_index( + values, i, &pid); + integral_value = (int64_t) pid; + break; + } + case LTTNG_PROCESS_ATTR_VALUE_TYPE_UID: + { + uid_t uid; - switch (lttng_tracker_id_get_type(id)) { - case LTTNG_ID_ALL: - break; - case LTTNG_ID_VALUE: - status = lttng_tracker_id_get_value(id, &value); - break; - case LTTNG_ID_STRING: - status = lttng_tracker_id_get_string( - id, &value_string); - break; - case LTTNG_ID_UNKNOWN: - ret = CMD_ERROR; - goto end; - } + values_status = lttng_process_attr_values_get_uid_at_index( + values, i, &uid); + integral_value = (int64_t) uid; + break; + } + case LTTNG_PROCESS_ATTR_VALUE_TYPE_GID: + { + gid_t gid; - if (status != LTTNG_TRACKER_ID_STATUS_OK) { - ERR("Invalid state for tracker id"); - ret = CMD_ERROR; - goto end; - } + values_status = lttng_process_attr_values_get_gid_at_index( + values, i, &gid); + integral_value = (int64_t) gid; + break; + } + case LTTNG_PROCESS_ATTR_VALUE_TYPE_USER_NAME: + values_status = lttng_process_attr_values_get_user_name_at_index( + values, i, &name); + break; + case LTTNG_PROCESS_ATTR_VALUE_TYPE_GROUP_NAME: + values_status = lttng_process_attr_values_get_group_name_at_index( + values, i, &name); + break; + default: + ret = CMD_ERROR; + goto end; + } - if (i) { - _MSG(","); - } - switch (lttng_tracker_id_get_type(id)) { - case LTTNG_ID_ALL: - _MSG(" *"); - break; - case LTTNG_ID_VALUE: - _MSG(" %d", value); - break; - case LTTNG_ID_STRING: - _MSG(" %s", value_string); - break; - case LTTNG_ID_UNKNOWN: - ERR("Invalid state for tracker id"); - ret = CMD_ERROR; - goto end; - } + if (values_status != LTTNG_PROCESS_ATTR_VALUES_STATUS_OK) { + /* + * Not possible given the current liblttng-ctl + * implementation. + */ + ERR("Unknown error occurred while fetching process attribute value in inclusion list"); + ret = CMD_FATAL; + goto end; + } - /* Mi */ - if (writer) { - ret = mi_lttng_id_target( - writer, tracker_type, id, 0); - if (ret) { - goto end; - } - } + if (is_value_type_name(value_type)) { + _MSG("`%s`", name); + } else { + _MSG("%" PRIi64, integral_value); } - _MSG(" ]\n\n"); - /* Mi close tracker_id and targets */ - if (writer) { - ret = mi_lttng_close_multi_element(writer, 2); + /* Mi */ + if (the_writer) { + ret = is_value_type_name(value_type) ? + mi_lttng_string_process_attribute_value( + the_writer, + process_attr, name, + false) : + mi_lttng_integral_process_attribute_value( + the_writer, + process_attr, + integral_value, false); if (ret) { goto end; } } } + MSG(""); + + /* Mi close tracker_id and targets */ + if (the_writer) { + ret = mi_lttng_close_multi_element(the_writer, 2); + if (ret) { + goto end; + } + } end: - lttng_tracker_ids_destroy(ids); + lttng_process_attr_tracker_handle_destroy(tracker_handle); return ret; } @@ -1647,9 +1800,10 @@ static int list_trackers(const struct lttng_domain *domain) { int ret = 0; + MSG("Tracked process attributes"); /* Trackers listing */ if (lttng_opt_mi) { - ret = mi_lttng_trackers_open(writer); + ret = mi_lttng_trackers_open(the_writer); if (ret) { goto end; } @@ -1658,49 +1812,55 @@ static int list_trackers(const struct lttng_domain *domain) switch (domain->type) { case LTTNG_DOMAIN_KERNEL: /* pid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_PID); + ret = list_process_attr_tracker(LTTNG_PROCESS_ATTR_PROCESS_ID); if (ret) { goto end; } /* vpid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_VPID); + ret = list_process_attr_tracker( + LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID); if (ret) { goto end; } /* uid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_UID); + ret = list_process_attr_tracker(LTTNG_PROCESS_ATTR_USER_ID); if (ret) { goto end; } /* vuid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_VUID); + ret = list_process_attr_tracker( + LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID); if (ret) { goto end; } /* gid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_GID); + ret = list_process_attr_tracker(LTTNG_PROCESS_ATTR_GROUP_ID); if (ret) { goto end; } /* vgid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_VGID); + ret = list_process_attr_tracker( + LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID); if (ret) { goto end; } break; case LTTNG_DOMAIN_UST: /* vpid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_VPID); + ret = list_process_attr_tracker( + LTTNG_PROCESS_ATTR_VIRTUAL_PROCESS_ID); if (ret) { goto end; } /* vuid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_VUID); + ret = list_process_attr_tracker( + LTTNG_PROCESS_ATTR_VIRTUAL_USER_ID); if (ret) { goto end; } /* vgid tracker */ - ret = list_tracker_ids(LTTNG_TRACKER_VGID); + ret = list_process_attr_tracker( + LTTNG_PROCESS_ATTR_VIRTUAL_GROUP_ID); if (ret) { goto end; } @@ -1708,9 +1868,10 @@ static int list_trackers(const struct lttng_domain *domain) default: break; } + MSG(); if (lttng_opt_mi) { /* Close trackers element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { goto end; } @@ -1812,7 +1973,7 @@ static enum cmd_error_code list_rotate_settings(const char *session_name) MSG("Automatic rotation schedules:"); if (lttng_opt_mi) { - ret = mi_lttng_writer_open_element(writer, + ret = mi_lttng_writer_open_element(the_writer, mi_lttng_element_rotation_schedules); if (ret) { cmd_ret = CMD_ERROR; @@ -1832,7 +1993,7 @@ static enum cmd_error_code list_rotate_settings(const char *session_name) } if (lttng_opt_mi) { - ret = mi_lttng_rotation_schedule(writer, schedule); + ret = mi_lttng_rotation_schedule(the_writer, schedule); if (ret) { tmp_ret = CMD_ERROR; } @@ -1850,7 +2011,7 @@ static enum cmd_error_code list_rotate_settings(const char *session_name) _MSG("\n"); if (lttng_opt_mi) { /* Close the rotation_schedules element. */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { cmd_ret = CMD_ERROR; goto end; @@ -1882,7 +2043,7 @@ static int mi_list_session(const char *session_name, /* We need to leave it open to append other informations * like domain, channel, events etc.*/ session_found = 1; - ret = mi_lttng_session(writer, &sessions[i], 1); + ret = mi_lttng_session(the_writer, &sessions[i], 1); if (ret) { goto end; } @@ -1909,21 +2070,21 @@ static int mi_list_sessions(struct lttng_session *sessions, int count) int ret, i; /* Opening sessions element */ - ret = mi_lttng_sessions_open(writer); + ret = mi_lttng_sessions_open(the_writer); if (ret) { goto end; } /* Listing sessions */ for (i = 0; i < count; i++) { - ret = mi_lttng_session(writer, &sessions[i], 0); + ret = mi_lttng_session(the_writer, &sessions[i], 0); if (ret) { goto end; } } /* Closing sessions element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { goto end; } @@ -1968,26 +2129,27 @@ static int list_sessions(const char *session_name) } else { /* Pretty print */ if (count == 0) { - MSG("Currently no available tracing session"); + MSG("Currently no available recording session"); goto end; } if (session_name == NULL) { - MSG("Available tracing sessions:"); + MSG("Available recording sessions:"); } for (i = 0; i < count; i++) { if (session_name != NULL) { if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) { session_found = 1; - MSG("Tracing session %s: [%s%s]", session_name, + MSG("Recording session %s: [%s%s]", session_name, active_string(sessions[i].enabled), snapshot_string(sessions[i].snapshot_mode)); if (*sessions[i].path) { MSG("%sTrace output: %s\n", indent4, sessions[i].path); } - memcpy(&listed_session, &sessions[i], - sizeof(listed_session)); + memcpy(&the_listed_session, + &sessions[i], + sizeof(the_listed_session)); break; } } else { @@ -2032,20 +2194,20 @@ static int mi_list_domains(struct lttng_domain *domains, int count) { int i, ret; /* Open domains element */ - ret = mi_lttng_domains_open(writer); + ret = mi_lttng_domains_open(the_writer); if (ret) { goto end; } for (i = 0; i < count; i++) { - ret = mi_lttng_domain(writer, &domains[i] , 0); + ret = mi_lttng_domain(the_writer, &domains[i], 0); if (ret) { goto end; } } /* Closing domains element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { goto end; } @@ -2154,23 +2316,24 @@ int cmd_list(int argc, const char **argv) /* Mi check */ if (lttng_opt_mi) { - writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi); - if (!writer) { + the_writer = mi_lttng_writer_create( + fileno(stdout), lttng_opt_mi); + if (!the_writer) { ret = CMD_ERROR; goto end; } /* Open command element */ - ret = mi_lttng_writer_command_open(writer, - mi_lttng_element_command_list); + ret = mi_lttng_writer_command_open( + the_writer, mi_lttng_element_command_list); if (ret) { 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( + the_writer, mi_lttng_element_command_output); if (ret) { ret = CMD_ERROR; goto end; @@ -2209,8 +2372,8 @@ int cmd_list(int argc, const char **argv) } if (opt_kernel || opt_userspace || opt_jul || opt_log4j || opt_python) { - handle = lttng_create_handle(session_name, &domain); - if (handle == NULL) { + the_handle = lttng_create_handle(session_name, &domain); + if (the_handle == NULL) { ret = CMD_FATAL; goto end; } @@ -2258,7 +2421,7 @@ int cmd_list(int argc, const char **argv) if (lttng_opt_mi) { /* Open element sessions * Present for xml consistency */ - ret = mi_lttng_sessions_open(writer); + ret = mi_lttng_sessions_open(the_writer); if (ret) { goto end; } @@ -2286,14 +2449,14 @@ int cmd_list(int argc, const char **argv) /* Add of domains and domain element for xml * consistency and validation */ - ret = mi_lttng_domains_open(writer); + ret = mi_lttng_domains_open(the_writer); if (ret) { goto end; } /* Open domain and leave it open for * nested channels printing */ - ret = mi_lttng_domain(writer, &domain, 1); + ret = mi_lttng_domain(the_writer, &domain, 1); if (ret) { goto end; } @@ -2315,7 +2478,8 @@ int cmd_list(int argc, const char **argv) if (lttng_opt_mi) { /* Close domain and domain element */ - ret = mi_lttng_close_multi_element(writer, 2); + ret = mi_lttng_close_multi_element( + the_writer, 2); } if (ret) { goto end; @@ -2334,7 +2498,7 @@ int cmd_list(int argc, const char **argv) } if (lttng_opt_mi) { - ret = mi_lttng_domains_open(writer); + ret = mi_lttng_domains_open(the_writer); if (ret) { ret = CMD_ERROR; goto end; @@ -2344,22 +2508,22 @@ int cmd_list(int argc, const char **argv) for (i = 0; i < nb_domain; i++) { switch (domains[i].type) { case LTTNG_DOMAIN_KERNEL: - MSG("=== Domain: Kernel ===\n"); + MSG("=== Domain: Linux kernel ===\n"); break; case LTTNG_DOMAIN_UST: - MSG("=== Domain: UST global ===\n"); - MSG("Buffer type: %s\n", + MSG("=== Domain: User space ===\n"); + MSG("Buffering scheme: %s\n", domains[i].buf_type == - LTTNG_BUFFER_PER_PID ? "per PID" : "per UID"); + LTTNG_BUFFER_PER_PID ? "per-process" : "per-user"); break; case LTTNG_DOMAIN_JUL: - MSG("=== Domain: JUL (Java Util Logging) ===\n"); + MSG("=== Domain: java.util.logging (JUL) ===\n"); break; case LTTNG_DOMAIN_LOG4J: - MSG("=== Domain: LOG4j (Logging for Java) ===\n"); + MSG("=== Domain: log4j ===\n"); break; case LTTNG_DOMAIN_PYTHON: - MSG("=== Domain: Python (logging) ===\n"); + MSG("=== Domain: Python logging ===\n"); break; default: MSG("=== Domain: Unimplemented ===\n"); @@ -2367,7 +2531,8 @@ int cmd_list(int argc, const char **argv) } if (lttng_opt_mi) { - ret = mi_lttng_domain(writer, &domains[i], 1); + ret = mi_lttng_domain(the_writer, + &domains[i], 1); if (ret) { ret = CMD_ERROR; goto end; @@ -2375,12 +2540,13 @@ int cmd_list(int argc, const char **argv) } /* Clean handle before creating a new one */ - if (handle) { - lttng_destroy_handle(handle); + if (the_handle) { + lttng_destroy_handle(the_handle); } - handle = lttng_create_handle(session_name, &domains[i]); - if (handle == NULL) { + the_handle = lttng_create_handle( + session_name, &domains[i]); + if (the_handle == NULL) { ret = CMD_FATAL; goto end; } @@ -2416,7 +2582,8 @@ int cmd_list(int argc, const char **argv) next_domain: if (lttng_opt_mi) { /* Close domain element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element( + the_writer); if (ret) { ret = CMD_ERROR; goto end; @@ -2426,7 +2593,8 @@ next_domain: } if (lttng_opt_mi) { /* Close the domains, session and sessions element */ - ret = mi_lttng_close_multi_element(writer, 3); + ret = mi_lttng_close_multi_element( + the_writer, 3); if (ret) { ret = CMD_ERROR; goto end; @@ -2438,14 +2606,14 @@ next_domain: /* Mi closing */ if (lttng_opt_mi) { /* Close output element */ - ret = mi_lttng_writer_close_element(writer); + ret = mi_lttng_writer_close_element(the_writer); if (ret) { ret = CMD_ERROR; goto end; } /* Command element close */ - ret = mi_lttng_writer_command_close(writer); + ret = mi_lttng_writer_command_close(the_writer); if (ret) { ret = CMD_ERROR; goto end; @@ -2453,14 +2621,14 @@ next_domain: } end: /* Mi clean-up */ - if (writer && mi_lttng_writer_destroy(writer)) { + if (the_writer && mi_lttng_writer_destroy(the_writer)) { /* Preserve original error code */ ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL; } free(domains); - if (handle) { - lttng_destroy_handle(handle); + if (the_handle) { + lttng_destroy_handle(the_handle); } poptFreeContext(pc);