* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <inttypes.h>
#include <popt.h>
#include <stdio.h>
#include <assert.h>
#include <common/mi-lttng.h>
+#include <lttng/constant.h>
#include "../command.h"
static int opt_kernel;
static int opt_jul;
static int opt_log4j;
+static int opt_python;
static char *opt_channel;
static int opt_domain;
static int opt_fields;
static int opt_syscall;
-#if 0
-/* Not implemented yet */
-static char *opt_cmd_name;
-static pid_t opt_pid;
-#endif
const char *indent4 = " ";
const char *indent6 = " ";
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
- {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
- {"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
- {"jul", 'j', POPT_ARG_VAL, &opt_jul, 1, 0, 0},
- {"log4j", 'l', POPT_ARG_VAL, &opt_log4j, 1, 0, 0},
-#if 0
- /* Not implemented yet */
- {"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
- {"pid", 'p', POPT_ARG_INT, &opt_pid, 0, 0, 0},
-#else
- {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
-#endif
- {"channel", 'c', POPT_ARG_STRING, &opt_channel, 0, 0, 0},
- {"domain", 'd', POPT_ARG_VAL, &opt_domain, 1, 0, 0},
- {"fields", 'f', POPT_ARG_VAL, &opt_fields, 1, 0, 0},
- {"syscall", 'S', POPT_ARG_VAL, &opt_syscall, 1, 0, 0},
+ {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
+ {"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
+ {"jul", 'j', POPT_ARG_VAL, &opt_jul, 1, 0, 0},
+ {"log4j", 'l', POPT_ARG_VAL, &opt_log4j, 1, 0, 0},
+ {"python", 'p', POPT_ARG_VAL, &opt_python, 1, 0, 0},
+ {"userspace", 'u', POPT_ARG_NONE, 0, OPT_USERSPACE, 0, 0},
+ {"channel", 'c', POPT_ARG_STRING, &opt_channel, 0, 0, 0},
+ {"domain", 'd', POPT_ARG_VAL, &opt_domain, 1, 0, 0},
+ {"fields", 'f', POPT_ARG_VAL, &opt_fields, 1, 0, 0},
+ {"syscall", 'S', POPT_ARG_VAL, &opt_syscall, 1, 0, 0},
{"list-options", 0, POPT_ARG_NONE, NULL, OPT_LIST_OPTIONS, NULL, NULL},
{0, 0, 0, 0, 0, 0, 0}
};
fprintf(ofp, " -k, --kernel Select kernel domain\n");
fprintf(ofp, " -u, --userspace Select user-space domain.\n");
fprintf(ofp, " -j, --jul Apply for Java application using JUL\n");
+ fprintf(ofp, " -l, --log4j Apply for Java application using LOG4J\n");
+ fprintf(ofp, " -p, --python Apply for Python application using logging\n");
fprintf(ofp, " -f, --fields List event fields.\n");
fprintf(ofp, " --syscall List available system calls.\n");
-#if 0
- fprintf(ofp, " -p, --pid PID List user-space events by PID\n");
-#endif
fprintf(ofp, "\n");
fprintf(ofp, "Session Options:\n");
fprintf(ofp, " -c, --channel NAME List details of a channel\n");
int ret;
FILE *fp = NULL;
char *cmdline = NULL;
- char path[20]; /* Can't go bigger than /proc/65535/cmdline */
+ /* Can't go bigger than /proc/LTTNG_MAX_PID/cmdline */
+ char path[sizeof("/proc//cmdline") + sizeof(LTTNG_MAX_PID_STR) - 1];
snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
fp = fopen(path, "r");
}
/* Caller must free() *cmdline */
- cmdline = malloc(PATH_MAX);
+ cmdline = zmalloc(PATH_MAX);
if (!cmdline) {
- perror("malloc cmdline");
+ PERROR("malloc cmdline");
goto end;
}
ret = fread(cmdline, 1, PATH_MAX, fp);
if (ret < 0) {
- perror("fread proc list");
+ PERROR("fread proc list");
}
end:
}
static
-const char *filter_string(int value)
+const char *safe_string(const char *str)
{
- switch (value) {
- case 1: return " [with filter]";
- default: return "";
- }
-}
-
-static
-const char *exclusion_string(int value)
-{
- switch (value) {
- case 1: return " [has exclusions]";
- default: return "";
- }
+ return str ? str : "";
}
static const char *logleveltype_string(enum lttng_loglevel_type value)
}
}
+/*
+ * Get exclusion names message for a single event.
+ *
+ * Returned pointer must be freed by caller. Returns NULL on error.
+ */
+static char *get_exclusion_names_msg(struct lttng_event *event)
+{
+ int ret;
+ int exclusion_count;
+ char *exclusion_msg = NULL;
+ char *at;
+ size_t i;
+ const char * const exclusion_fmt = " [exclusions: ";
+ const size_t exclusion_fmt_len = strlen(exclusion_fmt);
+
+ exclusion_count = lttng_event_get_exclusion_name_count(event);
+ if (exclusion_count < 0) {
+ goto end;
+ } else if (exclusion_count == 0) {
+ /*
+ * No exclusions: return copy of empty string so that
+ * it can be freed by caller.
+ */
+ exclusion_msg = strdup("");
+ goto end;
+ }
+
+ /*
+ * exclusion_msg's size is bounded by the exclusion_fmt string,
+ * a comma per entry, the entry count (fixed-size), a closing
+ * bracket, and a trailing \0.
+ */
+ exclusion_msg = malloc(exclusion_count +
+ exclusion_count * LTTNG_SYMBOL_NAME_LEN +
+ exclusion_fmt_len + 1);
+ if (!exclusion_msg) {
+ goto end;
+ }
+
+ at = strcpy(exclusion_msg, exclusion_fmt) + exclusion_fmt_len;
+ for (i = 0; i < exclusion_count; ++i) {
+ const char *name;
+
+ /* Append comma between exclusion names */
+ if (i > 0) {
+ *at = ',';
+ at++;
+ }
+
+ ret = lttng_event_get_exclusion_name(event, i, &name);
+ if (ret) {
+ /* Prints '?' on local error; should never happen */
+ *at = '?';
+ at++;
+ continue;
+ }
+
+ /* Append exclusion name */
+ at += sprintf(at, "%s", name);
+ }
+
+ /* This also puts a final '\0' at the end of exclusion_msg */
+ strcpy(at, "]");
+
+end:
+ return exclusion_msg;
+}
+
/*
* Pretty print single event.
*/
static void print_events(struct lttng_event *event)
{
+ int ret;
+ const char *filter_str;
+ char *filter_msg = NULL;
+ char *exclusion_msg = NULL;
+
+ ret = lttng_event_get_filter_string(event, &filter_str);
+
+ if (ret) {
+ filter_msg = strdup(" [failed to retrieve filter]");
+ } else if (filter_str) {
+ const char * const filter_fmt = " [filter: '%s']";
+
+ filter_msg = malloc(strlen(filter_str) +
+ strlen(filter_fmt) + 1);
+ if (filter_msg) {
+ sprintf(filter_msg, filter_fmt,
+ filter_str);
+ }
+ }
+
+ exclusion_msg = get_exclusion_names_msg(event);
+ if (!exclusion_msg) {
+ exclusion_msg = strdup(" [failed to retrieve exclusions]");
+ }
+
switch (event->type) {
case LTTNG_EVENT_TRACEPOINT:
{
indent6,
event->name,
logleveltype_string(event->loglevel_type),
- mi_lttng_loglevel_string(event->loglevel),
+ mi_lttng_loglevel_string(event->loglevel, handle->domain.type),
event->loglevel,
enabled_string(event->enabled),
- exclusion_string(event->exclusion),
- filter_string(event->filter));
+ safe_string(exclusion_msg),
+ safe_string(filter_msg));
} else {
MSG("%s%s (type: tracepoint)%s%s%s",
indent6,
event->name,
enabled_string(event->enabled),
- exclusion_string(event->exclusion),
- filter_string(event->filter));
+ safe_string(exclusion_msg),
+ safe_string(filter_msg));
}
break;
}
case LTTNG_EVENT_FUNCTION:
MSG("%s%s (type: function)%s%s", indent6,
event->name, enabled_string(event->enabled),
- filter_string(event->filter));
+ safe_string(filter_msg));
if (event->attr.probe.addr != 0) {
MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
} else {
case LTTNG_EVENT_PROBE:
MSG("%s%s (type: probe)%s%s", indent6,
event->name, enabled_string(event->enabled),
- filter_string(event->filter));
+ safe_string(filter_msg));
if (event->attr.probe.addr != 0) {
MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
} else {
case LTTNG_EVENT_FUNCTION_ENTRY:
MSG("%s%s (type: function)%s%s", indent6,
event->name, enabled_string(event->enabled),
- filter_string(event->filter));
+ safe_string(filter_msg));
MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
break;
case LTTNG_EVENT_SYSCALL:
case LTTNG_EVENT_NOOP:
MSG("%s (type: noop)%s%s", indent6,
enabled_string(event->enabled),
- filter_string(event->filter));
+ safe_string(filter_msg));
break;
case LTTNG_EVENT_ALL:
/* We should never have "all" events in list. */
assert(0);
break;
}
+
+ free(filter_msg);
+ free(exclusion_msg);
}
static const char *field_type(struct lttng_event_field *field)
goto end;
}
- /* Open pids element */
+ /* Open pids element element */
ret = mi_lttng_pids_open(writer);
if (ret) {
goto end;
for (i = 0; i < count; i++) {
if (cur_pid != events[i].pid) {
if (pid_element_open) {
- /* Close the previous events and pid element */
+ /* Close the previous events and pid element */
ret = mi_lttng_close_multi_element(writer, 2);
if (ret) {
goto end;
}
/* Write an event */
- ret = mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
if (ret) {
goto end;
}
{
int i, size, ret = CMD_SUCCESS;
struct lttng_domain domain;
- struct lttng_handle *handle;
- struct lttng_event *event_list;
+ struct lttng_handle *handle = NULL;
+ struct lttng_event *event_list = NULL;
pid_t cur_pid = 0;
char *cmdline = NULL;
const char *agent_domain_str;
domain.type = LTTNG_DOMAIN_JUL;
} else if (opt_log4j) {
domain.type = LTTNG_DOMAIN_LOG4J;
+ } else if (opt_python) {
+ domain.type = LTTNG_DOMAIN_PYTHON;
+ } else {
+ ERR("Invalid agent domain selected.");
+ ret = CMD_ERROR;
+ goto error;
}
agent_domain_str = get_domain_str(domain.type);
int i, size, ret = CMD_SUCCESS;
struct lttng_domain domain;
struct lttng_handle *handle;
- struct lttng_event *event_list;
+ struct lttng_event *event_list = NULL;
pid_t cur_pid = 0;
char *cmdline = NULL;
if (!event_element_open) {
/* Open and write the event */
- ret = mi_lttng_event(writer, &cur_event, 1);
+ ret = mi_lttng_event(writer, &cur_event, 1,
+ handle->domain.type);
if (ret) {
goto end;
}
}
}
- /* Close pids, domain, domains */
+ /* Close pid, domain, domains */
ret = mi_lttng_close_multi_element(writer, 3);
end:
return ret;
}
for (i = 0; i < count; i++) {
- ret = mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
if (ret) {
goto end;
}
}
for (i = 0; i < count; i++) {
- ret = mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
if (ret) {
goto end;
}
}
for (i = 0; i < count; i++) {
- ret = mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
if (ret) {
goto end;
}
}
for (i = 0; i < count; i++) {
- MSG("%s- %s%s (loglevel%s %s)", indent4, events[i].name,
- enabled_string(events[i].enabled),
- logleveltype_string(events[i].loglevel_type),
- mi_lttng_loglevel_string(events[i].loglevel));
+ const char *filter_str;
+ char *filter_msg = NULL;
+ struct lttng_event *event = &events[i];
+
+ ret = lttng_event_get_filter_string(event, &filter_str);
+ if (ret) {
+ filter_msg = strdup(" [failed to retrieve filter]");
+ } else if (filter_str) {
+ const char * const filter_fmt =
+ " [filter: '%s']";
+
+ filter_msg = malloc(strlen(filter_str) +
+ strlen(filter_fmt) + 1);
+ if (filter_msg) {
+ sprintf(filter_msg, filter_fmt,
+ filter_str);
+ }
+ }
+
+ if (event->loglevel_type !=
+ LTTNG_EVENT_LOGLEVEL_ALL) {
+ MSG("%s- %s%s (loglevel%s %s)%s", indent4,
+ event->name,
+ enabled_string(event->enabled),
+ logleveltype_string(
+ event->loglevel_type),
+ mi_lttng_loglevel_string(
+ event->loglevel,
+ handle->domain.type),
+ safe_string(filter_msg));
+ } else {
+ MSG("%s- %s%s%s", indent4, event->name,
+ enabled_string(event->enabled),
+ safe_string(filter_msg));
+ }
+ free(filter_msg);
}
MSG("");
}
for (i = 0; i < count; i++) {
- ret = mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
if (ret) {
goto end;
}
}
} else {
/* Pretty print */
- if (channel_name == NULL) {
+ if (count) {
MSG("Channels:\n-------------");
}
return ret;
}
+/*
+ * List tracker PID(s) of session and domain.
+ */
+static int list_tracker_pids(void)
+{
+ int ret = 0;
+ int enabled;
+ int *pids = NULL;
+ size_t nr_pids;
+
+ ret = lttng_list_tracker_pids(handle,
+ &enabled, &pids, &nr_pids);
+ if (ret) {
+ return ret;
+ }
+ if (enabled) {
+ int i;
+ _MSG("PID tracker: [");
+
+ /* Mi tracker_pid element*/
+ if (writer) {
+ /* Open tracker_pid and targets elements */
+ ret = mi_lttng_pid_tracker_open(writer);
+ if (ret) {
+ goto end;
+ }
+ }
+
+ for (i = 0; i < nr_pids; i++) {
+ if (i) {
+ _MSG(",");
+ }
+ _MSG(" %d", pids[i]);
+
+ /* Mi */
+ if (writer) {
+ ret = mi_lttng_pid_target(writer, pids[i], 0);
+ if (ret) {
+ goto end;
+ }
+ }
+ }
+ _MSG(" ]\n\n");
+
+ /* Mi close tracker_pid and targets */
+ if (writer) {
+ ret = mi_lttng_close_multi_element(writer,2);
+ if (ret) {
+ goto end;
+ }
+ }
+ }
+end:
+ free(pids);
+ return ret;
+
+}
+
+/*
+ * List all tracker of a domain
+ */
+static int list_trackers(void)
+{
+ int ret;
+
+ /* Trackers listing */
+ if (lttng_opt_mi) {
+ ret = mi_lttng_trackers_open(writer);
+ if (ret) {
+ goto end;
+ }
+ }
+
+ /* pid tracker */
+ ret = list_tracker_pids();
+ if (ret) {
+ goto end;
+ }
+
+ if (lttng_opt_mi) {
+ /* Close trackers element */
+ ret = mi_lttng_writer_close_element(writer);
+ if (ret) {
+ goto end;
+ }
+ }
+
+end:
+ return ret;
+}
+
/*
* Machine interface
* Find the session with session_name as name
active_string(sessions[i].enabled),
snapshot_string(sessions[i].snapshot_mode));
MSG("%sTrace path: %s", indent4, sessions[i].path);
- MSG("%sLive timer interval (usec): %u\n", indent4,
- sessions[i].live_timer_interval);
+ if (sessions[i].live_timer_interval != 0) {
+ MSG("%sLive timer interval (usec): %u", indent4,
+ sessions[i].live_timer_interval);
+ }
+ MSG("");
}
}
case LTTNG_DOMAIN_LOG4J:
MSG(" - LOG4j (Logging for Java)");
break;
+ case LTTNG_DOMAIN_PYTHON:
+ MSG(" - Python (logging)");
+ break;
default:
break;
}
domain.type = LTTNG_DOMAIN_JUL;
} else if (opt_log4j) {
domain.type = LTTNG_DOMAIN_LOG4J;
+ } else if (opt_python) {
+ domain.type = LTTNG_DOMAIN_PYTHON;
}
if (!opt_kernel && opt_syscall) {
goto end;
}
- if (opt_kernel || opt_userspace || opt_jul || opt_log4j) {
+ if (opt_kernel || opt_userspace || opt_jul || opt_log4j || opt_python) {
handle = lttng_create_handle(session_name, &domain);
if (handle == NULL) {
ret = CMD_FATAL;
}
if (session_name == NULL) {
- if (!opt_kernel && !opt_userspace && !opt_jul && !opt_log4j) {
+ if (!opt_kernel && !opt_userspace && !opt_jul && !opt_log4j
+ && !opt_python) {
ret = list_sessions(NULL);
if (ret) {
goto end;
goto end;
}
}
- if (opt_jul || opt_log4j) {
+ if (opt_jul || opt_log4j || opt_python) {
ret = list_agent_events();
if (ret) {
goto end;
}
+
+ /* Trackers */
+ ret = list_trackers();
+ if (ret) {
+ goto end;
+ }
+
+ /* Channels */
ret = list_channels(opt_channel);
if (ret) {
goto end;
case LTTNG_DOMAIN_LOG4J:
MSG("=== Domain: LOG4j (Logging for Java) ===\n");
break;
+ case LTTNG_DOMAIN_PYTHON:
+ MSG("=== Domain: Python (logging) ===\n");
+ break;
default:
MSG("=== Domain: Unimplemented ===\n");
break;
}
if (domains[i].type == LTTNG_DOMAIN_JUL ||
- domains[i].type == LTTNG_DOMAIN_LOG4J) {
+ domains[i].type == LTTNG_DOMAIN_LOG4J ||
+ domains[i].type == LTTNG_DOMAIN_PYTHON) {
ret = list_session_agent_events();
if (ret) {
goto end;
}
- continue;
+
+ goto next_domain;
+ }
+
+ switch (domains[i].type) {
+ case LTTNG_DOMAIN_KERNEL:
+ case LTTNG_DOMAIN_UST:
+ ret = list_trackers();
+ if (ret) {
+ goto end;
+ }
+ break;
+ default:
+ break;
}
ret = list_channels(opt_channel);
goto end;
}
+next_domain:
if (lttng_opt_mi) {
/* Close domain element */
ret = mi_lttng_writer_close_element(writer);
projects / lttng-tools.git / blobdiff