X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=b436777d671b74bb2165d97eae9a5e6a1c6604e7;hp=87935393edabbe076628d11a8a1f78c818225309;hb=2fa605f7de6b95f50fc864072bc1445c61eb2c79;hpb=5f1abdd942402eca8534903be9f6c1cddaa09185 diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index 87935393e..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 @@ -23,19 +24,19 @@ #include #include +#include + #include "../command.h" 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; -#if 0 -/* Not implemented yet */ -static char *opt_cmd_name; -static pid_t opt_pid; -#endif +static int opt_syscall; const char *indent4 = " "; const char *indent6 = " "; @@ -48,22 +49,20 @@ enum { }; static struct lttng_handle *handle; +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}, -#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}, + {"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} }; @@ -85,10 +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"); -#if 0 - fprintf(ofp, " -p, --pid PID List user-space events by PID\n"); -#endif + fprintf(ofp, " --syscall List available system calls.\n"); fprintf(ofp, "\n"); fprintf(ofp, "Session Options:\n"); fprintf(ofp, " -c, --channel NAME List details of a channel\n"); @@ -105,7 +104,7 @@ static void usage(FILE *ofp) static char *get_cmdline_by_pid(pid_t pid) { int ret; - FILE *fp; + FILE *fp = NULL; char *cmdline = NULL; char path[20]; /* Can't go bigger than /proc/65535/cmdline */ @@ -116,14 +115,20 @@ 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"); + goto end; + } ret = fread(cmdline, 1, PATH_MAX, fp); if (ret < 0) { - perror("fread proc list"); + PERROR("fread proc list"); } - fclose(fp); end: + if (fp) { + fclose(fp); + } return cmdline; } @@ -177,74 +182,6 @@ const char *exclusion_string(int value) } } -static const char *loglevel_jul_string(int value) -{ - switch (value) { - case -1: - return ""; - case LTTNG_LOGLEVEL_JUL_OFF: - return "JUL_OFF"; - case LTTNG_LOGLEVEL_JUL_SEVERE: - return "JUL_SEVERE"; - case LTTNG_LOGLEVEL_JUL_WARNING: - return "JUL_WARNING"; - case LTTNG_LOGLEVEL_JUL_INFO: - return "JUL_INFO"; - case LTTNG_LOGLEVEL_JUL_CONFIG: - return "JUL_CONFIG"; - case LTTNG_LOGLEVEL_JUL_FINE: - return "JUL_FINE"; - case LTTNG_LOGLEVEL_JUL_FINER: - return "JUL_FINER"; - case LTTNG_LOGLEVEL_JUL_FINEST: - return "JUL_FINEST"; - case LTTNG_LOGLEVEL_JUL_ALL: - return "JUL_ALL"; - default: - return "<>"; - } -} - -static const char *loglevel_string(int value) -{ - switch (value) { - case -1: - return ""; - case LTTNG_LOGLEVEL_EMERG: - return "TRACE_EMERG"; - case LTTNG_LOGLEVEL_ALERT: - return "TRACE_ALERT"; - case LTTNG_LOGLEVEL_CRIT: - return "TRACE_CRIT"; - case LTTNG_LOGLEVEL_ERR: - return "TRACE_ERR"; - case LTTNG_LOGLEVEL_WARNING: - return "TRACE_WARNING"; - case LTTNG_LOGLEVEL_NOTICE: - return "TRACE_NOTICE"; - case LTTNG_LOGLEVEL_INFO: - return "TRACE_INFO"; - case LTTNG_LOGLEVEL_DEBUG_SYSTEM: - return "TRACE_DEBUG_SYSTEM"; - case LTTNG_LOGLEVEL_DEBUG_PROGRAM: - return "TRACE_DEBUG_PROGRAM"; - case LTTNG_LOGLEVEL_DEBUG_PROCESS: - return "TRACE_DEBUG_PROCESS"; - case LTTNG_LOGLEVEL_DEBUG_MODULE: - return "TRACE_DEBUG_MODULE"; - case LTTNG_LOGLEVEL_DEBUG_UNIT: - return "TRACE_DEBUG_UNIT"; - case LTTNG_LOGLEVEL_DEBUG_FUNCTION: - return "TRACE_DEBUG_FUNCTION"; - case LTTNG_LOGLEVEL_DEBUG_LINE: - return "TRACE_DEBUG_LINE"; - case LTTNG_LOGLEVEL_DEBUG: - return "TRACE_DEBUG"; - default: - return "<>"; - } -} - static const char *logleveltype_string(enum lttng_loglevel_type value) { switch (value) { @@ -259,6 +196,21 @@ static const char *logleveltype_string(enum lttng_loglevel_type value) } } +static const char *bitness_event(enum lttng_event_flag flags) +{ + if (flags & LTTNG_EVENT_FLAG_SYSCALL_32) { + if (flags & LTTNG_EVENT_FLAG_SYSCALL_64) { + return " [32/64-bit]"; + } else { + return " [32-bit]"; + } + } else if (flags & LTTNG_EVENT_FLAG_SYSCALL_64) { + return " [64-bit]"; + } else { + return ""; + } +} + /* * Pretty print single event. */ @@ -272,7 +224,7 @@ static void print_events(struct lttng_event *event) indent6, event->name, logleveltype_string(event->loglevel_type), - loglevel_string(event->loglevel), + mi_lttng_loglevel_string(event->loglevel, handle->domain.type), event->loglevel, enabled_string(event->enabled), exclusion_string(event->exclusion), @@ -316,9 +268,10 @@ static void print_events(struct lttng_event *event) MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name); break; case LTTNG_EVENT_SYSCALL: - MSG("%ssyscalls (type: syscall)%s%s", indent6, + MSG("%s%s%s%s%s", indent6, event->name, + (opt_syscall ? "" : " (type:syscall)"), enabled_string(event->enabled), - filter_string(event->filter)); + bitness_event(event->flags)); break; case LTTNG_EVENT_NOOP: MSG("%s (type: noop)%s%s", indent6, @@ -361,58 +314,169 @@ static void print_event_field(struct lttng_event_field *field) field_type(field), field->nowrite ? " [no write]" : ""); } -static int list_jul_events(void) +/* + * Machine interface + * Jul and ust event listing + */ +static int mi_list_agent_ust_events(struct lttng_event *events, int count, + struct lttng_domain *domain) +{ + int ret, i; + pid_t cur_pid = 0; + char *cmdline = NULL; + int pid_element_open = 0; + + /* Open domains element */ + ret = mi_lttng_domains_open(writer); + if (ret) { + goto end; + } + + /* Write domain */ + ret = mi_lttng_domain(writer, domain, 1); + if (ret) { + goto end; + } + + /* Open pids 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 */ + ret = mi_lttng_close_multi_element(writer, 2); + if (ret) { + goto end; + } + pid_element_open = 0; + } + + cur_pid = events[i].pid; + cmdline = get_cmdline_by_pid(cur_pid); + if (!cmdline) { + ret = CMD_ERROR; + goto end; + } + + if (!pid_element_open) { + /* Open and write a pid element */ + ret = mi_lttng_pid(writer, cur_pid, cmdline, 1); + if (ret) { + goto error; + } + + /* Open events element */ + ret = mi_lttng_events_open(writer); + if (ret) { + goto error; + } + + pid_element_open = 1; + } + free(cmdline); + } + + /* Write an event */ + ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + if (ret) { + goto end; + } + } + + /* Close pids */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } + + /* Close domain, domains */ + ret = mi_lttng_close_multi_element(writer, 2); +end: + return ret; +error: + free(cmdline); + return ret; +} + +static int list_agent_events(void) { - int i, size; + int i, size, ret = CMD_SUCCESS; struct lttng_domain domain; struct lttng_handle *handle; struct lttng_event *event_list; pid_t cur_pid = 0; char *cmdline = NULL; - - DBG("Getting JUL tracing events"); + const char *agent_domain_str; memset(&domain, 0, sizeof(domain)); - domain.type = LTTNG_DOMAIN_JUL; + if (opt_jul) { + 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); + + DBG("Getting %s tracing events", agent_domain_str); handle = lttng_create_handle(NULL, &domain); if (handle == NULL) { - goto error; + ret = CMD_ERROR; + goto end; } size = lttng_list_tracepoints(handle, &event_list); if (size < 0) { - ERR("Unable to list JUL events: %s", lttng_strerror(size)); - lttng_destroy_handle(handle); - return size; - } - - MSG("JUL events (Logger name):\n-------------------------"); - - if (size == 0) { - MSG("None"); + ERR("Unable to list %s events: %s", agent_domain_str, + lttng_strerror(size)); + ret = CMD_ERROR; + goto end; } - for (i = 0; i < size; i++) { - if (cur_pid != event_list[i].pid) { - cur_pid = event_list[i].pid; - cmdline = get_cmdline_by_pid(cur_pid); - MSG("\nPID: %d - Name: %s", cur_pid, cmdline); - free(cmdline); + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_agent_ust_events(event_list, size, &domain); + if (ret) { + ret = CMD_ERROR; + goto error; } - MSG("%s- %s", indent6, event_list[i].name); - } + } else { + /* Pretty print */ + MSG("%s events (Logger name):\n-------------------------", + agent_domain_str); - MSG(""); + if (size == 0) { + MSG("None"); + } - free(event_list); - lttng_destroy_handle(handle); + for (i = 0; i < size; i++) { + if (cur_pid != event_list[i].pid) { + cur_pid = event_list[i].pid; + cmdline = get_cmdline_by_pid(cur_pid); + if (cmdline == NULL) { + ret = CMD_ERROR; + goto error; + } + MSG("\nPID: %d - Name: %s", cur_pid, cmdline); + free(cmdline); + } + MSG("%s- %s", indent6, event_list[i].name); + } - return CMD_SUCCESS; + MSG(""); + } error: + free(event_list); +end: lttng_destroy_handle(handle); - return -1; + return ret; } /* @@ -420,7 +484,7 @@ error: */ static int list_ust_events(void) { - int i, size; + int i, size, ret = CMD_SUCCESS; struct lttng_domain domain; struct lttng_handle *handle; struct lttng_event *event_list; @@ -435,42 +499,169 @@ static int list_ust_events(void) handle = lttng_create_handle(NULL, &domain); if (handle == NULL) { - goto error; + ret = CMD_ERROR; + goto end; } size = lttng_list_tracepoints(handle, &event_list); if (size < 0) { ERR("Unable to list UST events: %s", lttng_strerror(size)); - lttng_destroy_handle(handle); - return size; + ret = CMD_ERROR; + goto error; + } + + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_agent_ust_events(event_list, size, &domain); + } else { + /* Pretty print */ + MSG("UST events:\n-------------"); + + if (size == 0) { + MSG("None"); + } + + for (i = 0; i < size; i++) { + if (cur_pid != event_list[i].pid) { + cur_pid = event_list[i].pid; + cmdline = get_cmdline_by_pid(cur_pid); + if (cmdline == NULL) { + ret = CMD_ERROR; + goto error; + } + MSG("\nPID: %d - Name: %s", cur_pid, cmdline); + free(cmdline); + } + print_events(&event_list[i]); + } + + MSG(""); + } + +error: + free(event_list); +end: + lttng_destroy_handle(handle); + return ret; +} + +/* + * Machine interface + * List all ust event with their fields + */ +static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, + struct lttng_domain *domain) +{ + int ret, i; + pid_t cur_pid = 0; + char *cmdline = NULL; + int pid_element_open = 0; + int event_element_open = 0; + struct lttng_event cur_event; + + /* Open domains element */ + ret = mi_lttng_domains_open(writer); + if (ret) { + goto end; } - MSG("UST events:\n-------------"); + /* Write domain */ + ret = mi_lttng_domain(writer, domain, 1); + if (ret) { + goto end; + } - if (size == 0) { - MSG("None"); + /* Open pids element */ + ret = mi_lttng_pids_open(writer); + if (ret) { + goto end; } - for (i = 0; i < size; i++) { - if (cur_pid != event_list[i].pid) { - cur_pid = event_list[i].pid; + for (i = 0; i < count; i++) { + if (cur_pid != fields[i].event.pid) { + if (pid_element_open) { + if (event_element_open) { + + /* Close the previous field element and event. */ + ret = mi_lttng_close_multi_element(writer, 2); + if (ret) { + goto end; + } + event_element_open = 0; + } + /* Close the previous events, pid element */ + ret = mi_lttng_close_multi_element(writer, 2); + if (ret) { + goto end; + } + pid_element_open = 0; + } + + cur_pid = fields[i].event.pid; cmdline = get_cmdline_by_pid(cur_pid); - MSG("\nPID: %d - Name: %s", cur_pid, cmdline); + if (!pid_element_open) { + /* Open and write a pid element */ + ret = mi_lttng_pid(writer, cur_pid, cmdline, 1); + if (ret) { + goto error; + } + + /* Open events element */ + ret = mi_lttng_events_open(writer); + if (ret) { + goto error; + } + pid_element_open = 1; + } free(cmdline); + /* Wipe current event since we are about to print a new PID. */ + memset(&cur_event, 0, sizeof(cur_event)); } - print_events(&event_list[i]); - } - MSG(""); + 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); + if (ret) { + goto end; + } + event_element_open = 0; + } + + memcpy(&cur_event, &fields[i].event, + sizeof(cur_event)); - free(event_list); - lttng_destroy_handle(handle); + if (!event_element_open) { + /* Open and write the event */ + ret = mi_lttng_event(writer, &cur_event, 1, + handle->domain.type); + if (ret) { + goto end; + } + + /* Open a fields element */ + ret = mi_lttng_event_fields_open(writer); + if (ret) { + goto end; + } + event_element_open = 1; + } + } - return CMD_SUCCESS; + /* Print the event_field */ + ret = mi_lttng_event_field(writer, &fields[i]); + if (ret) { + goto end; + } + } + /* Close pids, domain, domains */ + ret = mi_lttng_close_multi_element(writer, 3); +end: + return ret; error: - lttng_destroy_handle(handle); - return -1; + free(cmdline); + return ret; } /* @@ -478,7 +669,7 @@ error: */ static int list_ust_event_fields(void) { - int i, size; + int i, size, ret = CMD_SUCCESS; struct lttng_domain domain; struct lttng_handle *handle; struct lttng_event_field *event_field_list; @@ -496,57 +687,113 @@ static int list_ust_event_fields(void) handle = lttng_create_handle(NULL, &domain); if (handle == NULL) { - goto error; + ret = CMD_ERROR; + goto end; } size = lttng_list_tracepoint_fields(handle, &event_field_list); if (size < 0) { ERR("Unable to list UST event fields: %s", lttng_strerror(size)); - lttng_destroy_handle(handle); - return size; + ret = CMD_ERROR; + goto end; } - MSG("UST events:\n-------------"); - - if (size == 0) { - MSG("None"); - } + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_ust_event_fields(event_field_list, size, &domain); + if (ret) { + ret = CMD_ERROR; + goto error; + } + } else { + /* Pretty print */ + MSG("UST events:\n-------------"); - for (i = 0; i < size; i++) { - if (cur_pid != event_field_list[i].event.pid) { - cur_pid = event_field_list[i].event.pid; - cmdline = get_cmdline_by_pid(cur_pid); - MSG("\nPID: %d - Name: %s", cur_pid, cmdline); - free(cmdline); - /* Wipe current event since we are about to print a new PID. */ - memset(&cur_event, 0, sizeof(cur_event)); + if (size == 0) { + MSG("None"); } - if (strcmp(cur_event.name, event_field_list[i].event.name) != 0) { - print_events(&event_field_list[i].event); - memcpy(&cur_event, &event_field_list[i].event, - sizeof(cur_event)); + + for (i = 0; i < size; i++) { + if (cur_pid != event_field_list[i].event.pid) { + cur_pid = event_field_list[i].event.pid; + cmdline = get_cmdline_by_pid(cur_pid); + if (cmdline == NULL) { + ret = CMD_ERROR; + goto error; + } + MSG("\nPID: %d - Name: %s", cur_pid, cmdline); + free(cmdline); + /* Wipe current event since we are about to print a new PID. */ + memset(&cur_event, 0, sizeof(cur_event)); + } + if (strcmp(cur_event.name, event_field_list[i].event.name) != 0) { + print_events(&event_field_list[i].event); + memcpy(&cur_event, &event_field_list[i].event, + sizeof(cur_event)); + } + print_event_field(&event_field_list[i]); } - print_event_field(&event_field_list[i]); - } - MSG(""); + MSG(""); + } +error: free(event_field_list); +end: lttng_destroy_handle(handle); + return ret; +} + +/* + * Machine interface + * Print a list of kernel events + */ +static int mi_list_kernel_events(struct lttng_event *events, int count, + struct lttng_domain *domain) +{ + int ret, i; - return CMD_SUCCESS; + /* Open domains element */ + ret = mi_lttng_domains_open(writer); + if (ret) { + goto end; + } -error: - lttng_destroy_handle(handle); - return -1; + /* Write domain */ + ret = mi_lttng_domain(writer, domain, 1); + if (ret) { + goto end; + } + + /* Open events */ + ret = mi_lttng_events_open(writer); + if (ret) { + goto end; + } + + for (i = 0; i < count; i++) { + ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + if (ret) { + goto end; + } + } + + /* close events, domain and domains */ + ret = mi_lttng_close_multi_element(writer, 3); + if (ret) { + goto end; + } + +end: + return ret; } /* - * Ask for all trace events in the kernel and pretty print them. + * Ask for all trace events in the kernel */ static int list_kernel_events(void) { - int i, size; + int i, size, ret = CMD_SUCCESS; struct lttng_domain domain; struct lttng_handle *handle; struct lttng_event *event_list; @@ -559,6 +806,7 @@ static int list_kernel_events(void) handle = lttng_create_handle(NULL, &domain); if (handle == NULL) { + ret = CMD_ERROR; goto error; } @@ -566,98 +814,253 @@ static int list_kernel_events(void) if (size < 0) { ERR("Unable to list kernel events: %s", lttng_strerror(size)); lttng_destroy_handle(handle); - return size; + return CMD_ERROR; } - MSG("Kernel events:\n-------------"); + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_kernel_events(event_list, size, &domain); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } else { + MSG("Kernel events:\n-------------"); + + for (i = 0; i < size; i++) { + print_events(&event_list[i]); + } - for (i = 0; i < size; i++) { - print_events(&event_list[i]); + MSG(""); } - MSG(""); - +end: free(event_list); lttng_destroy_handle(handle); - return CMD_SUCCESS; + return ret; error: lttng_destroy_handle(handle); - return -1; + return ret; } /* - * List JUL events for a specific session using the handle. - * - * Return CMD_SUCCESS on success else a negative value. + * Machine interface + * Print a list of system calls. */ -static int list_session_jul_events(void) +static int mi_list_syscalls(struct lttng_event *events, int count) { - int ret, count, i; - struct lttng_event *events = NULL; - - count = lttng_list_events(handle, "", &events); - if (count < 0) { - ret = count; - ERR("%s", lttng_strerror(ret)); - goto error; - } + int ret, i; - MSG("Events (Logger name):\n---------------------"); - if (count == 0) { - MSG("%sNone\n", indent6); + /* Open events */ + ret = mi_lttng_events_open(writer); + 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), - loglevel_jul_string(events[i].loglevel)); + ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + if (ret) { + goto end; + } } - MSG(""); + /* Close events. */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } end: - free(events); - ret = CMD_SUCCESS; - -error: return ret; } /* - * List events of channel of session and domain. + * Ask for kernel system calls. */ -static int list_events(const char *channel_name) +static int list_syscalls(void) { - int ret, count, i; - struct lttng_event *events = NULL; + int i, size, ret = CMD_SUCCESS; + struct lttng_event *event_list; - count = lttng_list_events(handle, channel_name, &events); - if (count < 0) { - ret = count; - ERR("%s", lttng_strerror(ret)); + DBG("Getting kernel system call events"); + + size = lttng_list_syscalls(&event_list); + if (size < 0) { + ERR("Unable to list system calls: %s", lttng_strerror(size)); + ret = CMD_ERROR; goto error; } - MSG("\n%sEvents:", indent4); - if (count == 0) { - MSG("%sNone\n", indent6); - goto end; + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_syscalls(event_list, size); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } else { + MSG("System calls:\n-------------"); + + for (i = 0; i < size; i++) { + print_events(&event_list[i]); + } + + MSG(""); + } + +end: + free(event_list); + return ret; + +error: + return ret; +} + +/* + * Machine Interface + * Print a list of agent events + */ +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); + if (ret) { + goto end; } for (i = 0; i < count; i++) { - print_events(&events[i]); + ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + if (ret) { + goto end; + } } - MSG(""); + /* Close events element */ + ret = mi_lttng_writer_close_element(writer); + +end: + return ret; +} + +/* + * List agent events for a specific session using the handle. + * + * Return CMD_SUCCESS on success else a negative value. + */ +static int list_session_agent_events(void) +{ + int ret = CMD_SUCCESS, count, i; + struct lttng_event *events = NULL; + + count = lttng_list_events(handle, "", &events); + if (count < 0) { + ret = CMD_ERROR; + ERR("%s", lttng_strerror(count)); + goto error; + } + + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_session_agent_events(events, count); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } else { + /* Pretty print */ + MSG("Events (Logger name):\n---------------------"); + if (count == 0) { + MSG("%sNone\n", indent6); + 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, + handle->domain.type)); + } + + MSG(""); + } end: free(events); - ret = CMD_SUCCESS; +error: + return ret; +} + +/* + * Machine interface + * print a list of event + */ +static int mi_list_events(struct lttng_event *events, int count) +{ + int ret, i; + + /* Open events element */ + ret = mi_lttng_events_open(writer); + if (ret) { + goto end; + } + + for (i = 0; i < count; i++) { + ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type); + if (ret) { + goto end; + } + } + + /* Close events element */ + ret = mi_lttng_writer_close_element(writer); + +end: + return ret; +} + +/* + * List events of channel of session and domain. + */ +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); + if (count < 0) { + ret = CMD_ERROR; + ERR("%s", lttng_strerror(count)); + goto error; + } + + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_events(events, count); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } else { + /* Pretty print */ + MSG("\n%sEvents:", indent4); + if (count == 0) { + MSG("%sNone\n", indent6); + goto end; + } + for (i = 0; i < count; i++) { + print_events(&events[i]); + } + + MSG(""); + } +end: + free(events); error: return ret; } @@ -687,6 +1090,65 @@ static void print_channel(struct lttng_channel *channel) } } +/* + * Machine interface + * Print a list of channel + * + */ +static int mi_list_channels(struct lttng_channel *channels, int count, + const char *channel_name) +{ + int i, ret; + unsigned int chan_found = 0; + + /* Open channels element */ + ret = mi_lttng_channels_open(writer); + if (ret) { + goto error; + } + + for (i = 0; i < count; i++) { + if (channel_name != NULL) { + if (strncmp(channels[i].name, channel_name, NAME_MAX) == 0) { + chan_found = 1; + } else { + continue; + } + } + + /* Write channel element and leave it open */ + ret = mi_lttng_channel(writer, &channels[i], 1); + if (ret) { + goto error; + } + + /* Listing events per channel */ + ret = list_events(channels[i].name); + if (ret) { + goto error; + } + + /* Closing the channel element we opened earlier */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto error; + } + + if (chan_found) { + break; + } + } + + /* Close channels element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto error; + } + +error: + return ret; +} + /* * List channel(s) of session and domain. * @@ -704,54 +1166,170 @@ static int list_channels(const char *channel_name) if (count < 0) { switch (-count) { case LTTNG_ERR_KERN_CHAN_NOT_FOUND: - ret = CMD_SUCCESS; - WARN("No kernel channel"); + if (lttng_opt_mi) { + /* When printing mi this is not an error + * but an empty channels element */ + count = 0; + } else { + ret = CMD_SUCCESS; + WARN("No kernel channel"); + goto error_channels; + } break; default: /* We had a real error */ - ret = count; - ERR("%s", lttng_strerror(ret)); + ret = CMD_ERROR; + ERR("%s", lttng_strerror(count)); + goto error_channels; break; } - goto error_channels; } - if (channel_name == NULL) { - MSG("Channels:\n-------------"); - } + if (lttng_opt_mi) { + /* Mi print */ + ret = mi_list_channels(channels, count, channel_name); + if (ret) { + ret = CMD_ERROR; + goto error; + } + } else { + /* Pretty print */ + if (count) { + MSG("Channels:\n-------------"); + } - for (i = 0; i < count; i++) { - if (channel_name != NULL) { - if (strncmp(channels[i].name, channel_name, NAME_MAX) == 0) { - chan_found = 1; - } else { - continue; + for (i = 0; i < count; i++) { + if (channel_name != NULL) { + if (strncmp(channels[i].name, channel_name, NAME_MAX) == 0) { + chan_found = 1; + } else { + continue; + } + } + print_channel(&channels[i]); + + /* Listing events per channel */ + ret = list_events(channels[i].name); + if (ret) { + goto error; + } + + if (chan_found) { + break; } } - print_channel(&channels[i]); - /* Listing events per channel */ - ret = list_events(channels[i].name); - if (ret < 0) { - ERR("%s", lttng_strerror(ret)); + if (!chan_found && channel_name != NULL) { + ret = CMD_ERROR; + ERR("Channel %s not found", channel_name); + goto error; + } + } +error: + free(channels); + +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; +} - if (chan_found) { +/* + * Machine interface + * Find the session with session_name as name + * and print his informations. + */ +static int mi_list_session(const char *session_name, + struct lttng_session *sessions, int count) +{ + int ret, i; + unsigned int session_found = 0; + + if (session_name == NULL) { + ret = -LTTNG_ERR_SESS_NOT_FOUND; + goto end; + } + + for (i = 0; i < count; i++) { + if (strncmp(sessions[i].name, session_name, NAME_MAX) == 0) { + /* 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); + if (ret) { + goto end; + } break; } } - if (!chan_found && channel_name != NULL) { - ERR("Channel %s not found", channel_name); - goto error; + if (!session_found) { + ERR("Session '%s' not found", session_name); + ret = -LTTNG_ERR_SESS_NOT_FOUND; + goto end; } - ret = CMD_SUCCESS; +end: + return ret; +} -error: - free(channels); +/* + * Machine interface + * List all availables session + */ +static int mi_list_sessions(struct lttng_session *sessions, int count) +{ + int ret, i; -error_channels: + /* Opening sessions element */ + ret = mi_lttng_sessions_open(writer); + if (ret) { + goto end; + } + + /* Listing sessions */ + for (i = 0; i < count; i++) { + ret = mi_lttng_session(writer, &sessions[i], 0); + if (ret) { + goto end; + } + } + + /* Closing sessions element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } + +end: return ret; } @@ -762,60 +1340,112 @@ error_channels: */ static int list_sessions(const char *session_name) { - int ret, count, i; + int ret = CMD_SUCCESS; + int count, i; unsigned int session_found = 0; struct lttng_session *sessions; count = lttng_list_sessions(&sessions); DBG("Session count %d", count); if (count < 0) { - ret = count; - ERR("%s", lttng_strerror(ret)); - goto error; - } else if (count == 0) { - MSG("Currently no available tracing session"); + ret = CMD_ERROR; + ERR("%s", lttng_strerror(count)); goto end; } - if (session_name == NULL) { - MSG("Available tracing sessions:"); - } + if (lttng_opt_mi) { + /* Mi */ + if (session_name == NULL) { + /* List all session */ + ret = mi_list_sessions(sessions, count); + } else { + /* Note : this return an open session element */ + ret = mi_list_session(session_name, sessions, count); + } + if (ret) { + ret = CMD_ERROR; + goto error; + } + } else { + /* Pretty print */ + if (count == 0) { + MSG("Currently no available tracing session"); + goto end; + } - 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, + if (session_name == NULL) { + MSG("Available tracing 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, + active_string(sessions[i].enabled), + snapshot_string(sessions[i].snapshot_mode)); + MSG("%sTrace path: %s\n", indent4, sessions[i].path); + break; + } + } else { + MSG(" %d) %s (%s) [%s%s]", i + 1, + sessions[i].name, sessions[i].path, 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); - break; + if (sessions[i].live_timer_interval != 0) { + MSG("%sLive timer interval (usec): %u", indent4, + sessions[i].live_timer_interval); + } + MSG(""); } - } else { - MSG(" %d) %s (%s) [%s%s]", i + 1, sessions[i].name, sessions[i].path, - active_string(sessions[i].enabled), - snapshot_string(sessions[i].snapshot_mode)); + } + + if (!session_found && session_name != NULL) { + ERR("Session '%s' not found", session_name); + ret = CMD_ERROR; + goto error; + } + + if (session_name == NULL) { + MSG("\nUse lttng list for more details"); } } +error: free(sessions); +end: + return ret; +} - if (!session_found && session_name != NULL) { - ERR("Session '%s' not found", session_name); - ret = CMD_ERROR; - goto error; + +/* + * Machine Interface + * list available domain(s) for a session. + */ +static int mi_list_domains(struct lttng_domain *domains, int count) +{ + int i, ret; + /* Open domains element */ + ret = mi_lttng_domains_open(writer); + if (ret) { + goto end; } - if (session_name == NULL) { - MSG("\nUse lttng list for more details"); + for (i = 0; i < count; i++) { + ret = mi_lttng_domain(writer, &domains[i] , 0); + if (ret) { + goto end; + } } + /* Closing domains element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto end; + } end: - return CMD_SUCCESS; - -error: return ret; } @@ -827,38 +1457,56 @@ static int list_domains(const char *session_name) int i, count, ret = CMD_SUCCESS; struct lttng_domain *domains = NULL; - MSG("Domains:\n-------------"); count = lttng_list_domains(session_name, &domains); if (count < 0) { - ret = count; - ERR("%s", lttng_strerror(ret)); - goto error; - } else if (count == 0) { - MSG(" None"); + ret = CMD_ERROR; + ERR("%s", lttng_strerror(count)); goto end; } - for (i = 0; i < count; i++) { - switch (domains[i].type) { - case LTTNG_DOMAIN_KERNEL: - MSG(" - Kernel"); - break; - case LTTNG_DOMAIN_UST: - MSG(" - UST global"); - break; - case LTTNG_DOMAIN_JUL: - MSG(" - JUL (Java Util Logging)"); - break; - default: - break; + if (lttng_opt_mi) { + /* Mi output */ + ret = mi_list_domains(domains, count); + if (ret) { + ret = CMD_ERROR; + goto error; + } + } else { + /* Pretty print */ + MSG("Domains:\n-------------"); + if (count == 0) { + MSG(" None"); + goto end; + } + + for (i = 0; i < count; i++) { + switch (domains[i].type) { + case LTTNG_DOMAIN_KERNEL: + MSG(" - Kernel"); + break; + case LTTNG_DOMAIN_UST: + MSG(" - UST global"); + break; + case LTTNG_DOMAIN_JUL: + MSG(" - JUL (Java Util Logging)"); + break; + case LTTNG_DOMAIN_LOG4J: + MSG(" - LOG4j (Logging for Java)"); + break; + case LTTNG_DOMAIN_PYTHON: + MSG(" - Python (logging)"); + break; + default: + break; + } } } -end: +error: free(domains); -error: +end: return ret; } @@ -902,6 +1550,31 @@ 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) { + ret = CMD_ERROR; + goto end; + } + + /* Open command element */ + ret = mi_lttng_writer_command_open(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); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } + /* Get session name (trailing argument) */ session_name = poptGetArg(pc); DBG2("Session name: %s", session_name); @@ -914,9 +1587,19 @@ int cmd_list(int argc, const char **argv) } else if (opt_jul) { DBG2("Listing JUL domain"); 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) { + WARN("--syscall will only work with the Kernel domain (-k)"); + ret = CMD_ERROR; + goto end; } - if (opt_kernel || opt_userspace || opt_jul) { + if (opt_kernel || opt_userspace || opt_jul || opt_log4j || opt_python) { handle = lttng_create_handle(session_name, &domain); if (handle == NULL) { ret = CMD_FATAL; @@ -925,17 +1608,24 @@ int cmd_list(int argc, const char **argv) } if (session_name == NULL) { - if (!opt_kernel && !opt_userspace && !opt_jul) { + if (!opt_kernel && !opt_userspace && !opt_jul && !opt_log4j + && !opt_python) { ret = list_sessions(NULL); - if (ret != 0) { + if (ret) { goto end; } } if (opt_kernel) { - ret = list_kernel_events(); - if (ret < 0) { - ret = CMD_ERROR; - goto end; + if (opt_syscall) { + ret = list_syscalls(); + if (ret) { + goto end; + } + } else { + ret = list_kernel_events(); + if (ret) { + goto end; + } } } if (opt_userspace) { @@ -944,22 +1634,29 @@ int cmd_list(int argc, const char **argv) } else { ret = list_ust_events(); } - if (ret < 0) { - ret = CMD_ERROR; + if (ret) { goto end; } } - if (opt_jul) { - ret = list_jul_events(); - if (ret < 0) { - ret = CMD_ERROR; + if (opt_jul || opt_log4j || opt_python) { + ret = list_agent_events(); + if (ret) { goto end; } } } else { /* List session attributes */ + if (lttng_opt_mi) { + /* Open element sessions + * Present for xml consistency */ + ret = mi_lttng_sessions_open(writer); + if (ret) { + goto end; + } + } + /* MI: the ouptut of list_sessions is an unclosed session element */ ret = list_sessions(session_name); - if (ret != 0) { + if (ret) { goto end; } @@ -969,23 +1666,64 @@ int cmd_list(int argc, const char **argv) goto end; } + /* Channel listing */ if (opt_kernel || opt_userspace) { - /* Channel listing */ + if (lttng_opt_mi) { + /* Add of domains and domain element for xml + * consistency and validation + */ + ret = mi_lttng_domains_open(writer); + if (ret) { + goto end; + } + + /* Open domain and leave it open for + * nested channels printing */ + ret = mi_lttng_domain(writer, &domain, 1); + if (ret) { + goto end; + } + + } + + ret = list_tracker_pids(); + if (ret) { + goto end; + } + ret = list_channels(opt_channel); - if (ret < 0) { + if (ret) { + goto end; + } + + if (lttng_opt_mi) { + /* Close domain and domain element */ + ret = mi_lttng_close_multi_element(writer, 2); + } + if (ret) { goto end; } + + } else { int i, nb_domain; /* We want all domain(s) */ nb_domain = lttng_list_domains(session_name, &domains); if (nb_domain < 0) { - ret = nb_domain; - ERR("%s", lttng_strerror(ret)); + ret = CMD_ERROR; + ERR("%s", lttng_strerror(nb_domain)); goto end; } + if (lttng_opt_mi) { + ret = mi_lttng_domains_open(writer); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } + for (i = 0; i < nb_domain; i++) { switch (domains[i].type) { case LTTNG_DOMAIN_KERNEL: @@ -1000,11 +1738,25 @@ int cmd_list(int argc, const char **argv) case LTTNG_DOMAIN_JUL: MSG("=== Domain: JUL (Java Util Logging) ===\n"); break; + 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 (lttng_opt_mi) { + ret = mi_lttng_domain(writer, &domains[i], 1); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } + /* Clean handle before creating a new one */ if (handle) { lttng_destroy_handle(handle); @@ -1016,23 +1768,77 @@ int cmd_list(int argc, const char **argv) goto end; } - if (domains[i].type == LTTNG_DOMAIN_JUL) { - ret = list_session_jul_events(); - if (ret < 0) { + if (domains[i].type == LTTNG_DOMAIN_JUL || + domains[i].type == LTTNG_DOMAIN_LOG4J || + domains[i].type == LTTNG_DOMAIN_PYTHON) { + ret = list_session_agent_events(); + if (ret) { goto end; } 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 < 0) { + if (ret) { + goto end; + } + + if (lttng_opt_mi) { + /* Close domain element */ + ret = mi_lttng_writer_close_element(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); + if (ret) { + ret = CMD_ERROR; goto end; } } } } + /* Mi closing */ + if (lttng_opt_mi) { + /* Close output element */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + ret = CMD_ERROR; + goto end; + } + + /* Command element close */ + ret = mi_lttng_writer_command_close(writer); + if (ret) { + ret = CMD_ERROR; + goto end; + } + } end: + /* Mi clean-up */ + if (writer && mi_lttng_writer_destroy(writer)) { + /* Preserve original error code */ + ret = ret ? ret : -LTTNG_ERR_MI_IO_FAIL; + } + free(domains); if (handle) { lttng_destroy_handle(handle);