#include <common/mi-lttng.h>
#include <common/time.h>
#include <common/tracker.h>
-#include <lttng/constant.h>
-#include <lttng/tracker.h>
+#include <lttng/domain-internal.h>
+#include <lttng/lttng.h>
#include "../command.h"
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 */
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);
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);
MSG("%sLookup method: INVALID LOOKUP TYPE ENCOUNTERED", indent8);
break;
}
+
+ free(binary_path);
break;
}
default:
{
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,
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;
}
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;
}
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;
}
}
/* 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:
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);
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;
}
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;
}
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;
}
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;
}
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;
}
}
/* 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:
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;
}
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;
}
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;
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));
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,
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;
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));
}
} else {
/* Pretty print */
- MSG("\n%sEvent rules:", indent4);
+ MSG("\n%sRecording event rules:", indent4);
if (count == 0) {
MSG("%sNone\n", indent6);
goto end;
}
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
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;
}
}
/* 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;
}
}
/* 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;
}
}
/* Close channels element */
- ret = mi_lttng_writer_close_element(writer);
+ ret = mi_lttng_writer_close_element(the_writer);
if (ret) {
goto error;
}
DBG("Listing channel(s) (%s)", channel_name ? : "<all>");
- 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:
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),
- handle->session_name);
+ the_handle->session_name);
ret = CMD_ERROR;
break;
default:
{
int ret;
- ret = mi_lttng_process_attribute_tracker_open(writer, process_attr);
+ ret = mi_lttng_process_attribute_tracker_open(the_writer, process_attr);
if (ret) {
goto end;
}
- ret = mi_lttng_close_multi_element(writer, 2);
+ ret = mi_lttng_close_multi_element(the_writer, 2);
end:
return ret;
}
const struct lttng_process_attr_values *values;
struct lttng_process_attr_tracker_handle *tracker_handle = NULL;
- ret_code = lttng_session_get_tracker_handle(handle->session_name,
- handle->domain.type, process_attr, &tracker_handle);
+ 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));
case LTTNG_TRACKING_POLICY_INCLUDE_SET:
break;
case LTTNG_TRACKING_POLICY_EXCLUDE_ALL:
- if (writer) {
+ if (the_writer) {
mi_output_empty_tracker(process_attr);
}
MSG("none");
default:
ERR("Unknown tracking policy encoutered while listing the %s process attribute tracker of session `%s`",
lttng_process_attr_to_string(process_attr),
- handle->session_name);
+ the_handle->session_name);
ret = CMD_FATAL;
goto end;
}
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),
- handle->session_name);
+ the_handle->session_name);
ret = CMD_FATAL;
goto end;
}
if (count == 0) {
/* Functionally equivalent to the 'exclude all' policy. */
- if (writer) {
+ if (the_writer) {
mi_output_empty_tracker(process_attr);
}
MSG("none");
}
/* Mi tracker_id element */
- if (writer) {
+ if (the_writer) {
/* Open tracker_id and targets elements */
ret = mi_lttng_process_attribute_tracker_open(
- writer, process_attr);
+ the_writer, process_attr);
if (ret) {
goto end;
}
}
/* Mi */
- if (writer) {
+ if (the_writer) {
ret = is_value_type_name(value_type) ?
mi_lttng_string_process_attribute_value(
- writer,
- process_attr,
- name, false) :
+ the_writer,
+ process_attr, name,
+ false) :
mi_lttng_integral_process_attribute_value(
- writer,
- process_attr,
- integral_value,
- false);
+ the_writer,
+ process_attr,
+ integral_value, false);
if (ret) {
goto end;
}
MSG("");
/* Mi close tracker_id and targets */
- if (writer) {
- ret = mi_lttng_close_multi_element(writer, 2);
+ if (the_writer) {
+ ret = mi_lttng_close_multi_element(the_writer, 2);
if (ret) {
goto end;
}
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;
}
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;
}
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;
}
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;
}
_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;
/* 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;
}
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;
}
} 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 {
{
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;
}
/* 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;
}
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;
}
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;
}
/* 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;
}
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;
}
if (lttng_opt_mi) {
- ret = mi_lttng_domains_open(writer);
+ ret = mi_lttng_domains_open(the_writer);
if (ret) {
ret = CMD_ERROR;
goto end;
}
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;
}
/* 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;
}
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;
}
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;
/* 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;
}
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);
projects / lttng-tools.git / blobdiff