X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=b436777d671b74bb2165d97eae9a5e6a1c6604e7;hp=62ed042f999cd43768fd3e5f147cdce20f508efe;hb=2fa605f7de6b95f50fc864072bc1445c61eb2c79;hpb=834978fd9e2392f20867351ca99bf7bdf31b4f56 diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index 62ed042f9..b436777d6 100644 --- a/src/bin/lttng/commands/list.c +++ b/src/bin/lttng/commands/list.c @@ -16,6 +16,7 @@ */ #define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -31,15 +32,11 @@ static int opt_userspace; 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 = " "; @@ -56,21 +53,16 @@ static struct mi_writer *writer; 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} }; @@ -92,11 +84,10 @@ static void usage(FILE *ofp) 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"); @@ -124,14 +115,14 @@ static char *get_cmdline_by_pid(pid_t pid) } /* 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: @@ -233,7 +224,7 @@ static void print_events(struct lttng_event *event) 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), @@ -390,7 +381,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count, } /* 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; } @@ -426,6 +417,8 @@ static int list_agent_events(void) domain.type = LTTNG_DOMAIN_JUL; } else if (opt_log4j) { domain.type = LTTNG_DOMAIN_LOG4J; + } else if (opt_python) { + domain.type = LTTNG_DOMAIN_PYTHON; } agent_domain_str = get_domain_str(domain.type); @@ -640,7 +633,8 @@ 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); + ret = mi_lttng_event(writer, &cur_event, 1, + handle->domain.type); if (ret) { goto end; } @@ -778,7 +772,7 @@ static int mi_list_kernel_events(struct lttng_event *events, int count, } 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; } @@ -866,7 +860,7 @@ static int mi_list_syscalls(struct lttng_event *events, int count) } 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; } @@ -939,7 +933,7 @@ static int mi_list_session_agent_events(struct lttng_event *events, int count) } 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; } @@ -988,7 +982,8 @@ static int list_session_agent_events(void) 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)); + mi_lttng_loglevel_string(events[i].loglevel, + handle->domain.type)); } MSG(""); @@ -1015,7 +1010,7 @@ static int mi_list_events(struct lttng_event *events, int count) } 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; } @@ -1199,7 +1194,7 @@ static int list_channels(const char *channel_name) } } else { /* Pretty print */ - if (channel_name == NULL) { + if (count) { MSG("Channels:\n-------------"); } @@ -1237,6 +1232,36 @@ error_channels: return ret; } +/* + * List tracker PID(s) of session and domain. + */ +static int list_tracker_pids(void) +{ + int enabled, ret; + 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: ["); + + for (i = 0; i < nr_pids; i++) { + if (i) { + _MSG(","); + } + _MSG(" %d", pids[i]); + } + _MSG(" ]\n\n"); + } + free(pids); + return 0; +} + /* * Machine interface * Find the session with session_name as name @@ -1369,8 +1394,11 @@ static int list_sessions(const char *session_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(""); } } @@ -1466,6 +1494,9 @@ static int list_domains(const char *session_name) case LTTNG_DOMAIN_LOG4J: MSG(" - LOG4j (Logging for Java)"); break; + case LTTNG_DOMAIN_PYTHON: + MSG(" - Python (logging)"); + break; default: break; } @@ -1558,6 +1589,8 @@ int cmd_list(int argc, const char **argv) 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) { @@ -1566,7 +1599,7 @@ int cmd_list(int argc, const char **argv) 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; @@ -1575,7 +1608,8 @@ int cmd_list(int argc, const char **argv) } 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; @@ -1604,7 +1638,7 @@ int cmd_list(int argc, const char **argv) goto end; } } - if (opt_jul || opt_log4j) { + if (opt_jul || opt_log4j || opt_python) { ret = list_agent_events(); if (ret) { goto end; @@ -1652,6 +1686,11 @@ int cmd_list(int argc, const char **argv) } + ret = list_tracker_pids(); + if (ret) { + goto end; + } + ret = list_channels(opt_channel); if (ret) { goto end; @@ -1702,6 +1741,9 @@ int cmd_list(int argc, const char **argv) 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; @@ -1727,7 +1769,8 @@ int cmd_list(int argc, const char **argv) } 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; @@ -1735,6 +1778,18 @@ int cmd_list(int argc, const char **argv) continue; } + switch (domains[i].type) { + case LTTNG_DOMAIN_KERNEL: + case LTTNG_DOMAIN_UST: + ret = list_tracker_pids(); + if (ret) { + goto end; + } + break; + default: + break; + } + ret = list_channels(opt_channel); if (ret) { goto end;