/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 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 <string.h>
#include <assert.h>
+#include <common/mi-lttng.h>
+
#include "../command.h"
-static int opt_pid;
static int opt_userspace;
-static char *opt_cmd_name;
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;
const char *indent4 = " ";
const char *indent6 = " ";
enum {
OPT_HELP = 1,
OPT_USERSPACE,
+ OPT_LIST_OPTIONS,
};
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},
- {"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},
- {"channel", 'c', POPT_ARG_STRING, &opt_channel, 0, 0, 0},
- {"domain", 'd', POPT_ARG_VAL, &opt_domain, 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}
};
*/
static void usage(FILE *ofp)
{
- fprintf(ofp, "usage: lttng list [[-k] [-u] [-p PID] [SESSION [<options>]]]\n");
+ fprintf(ofp, "usage: lttng list [OPTIONS] [SESSION [SESSION OPTIONS]]\n");
fprintf(ofp, "\n");
fprintf(ofp, "With no arguments, list available tracing session(s)\n");
fprintf(ofp, "\n");
- fprintf(ofp, "With -k alone, list available kernel events\n");
- fprintf(ofp, "With -u alone, list available userspace events\n");
+ fprintf(ofp, "Without a session, -k lists available kernel events\n");
+ fprintf(ofp, "Without a session, -u lists available userspace events\n");
fprintf(ofp, "\n");
fprintf(ofp, " -h, --help Show this help\n");
+ fprintf(ofp, " --list-options Simple listing of options\n");
fprintf(ofp, " -k, --kernel Select kernel domain\n");
fprintf(ofp, " -u, --userspace Select user-space domain.\n");
- fprintf(ofp, " -p, --pid PID List user-space events by PID\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");
fprintf(ofp, "\n");
- fprintf(ofp, "Options:\n");
+ fprintf(ofp, "Session Options:\n");
fprintf(ofp, " -c, --channel NAME List details of a channel\n");
fprintf(ofp, " -d, --domain List available domain(s)\n");
fprintf(ofp, "\n");
static char *get_cmdline_by_pid(pid_t pid)
{
int ret;
- FILE *fp;
+ FILE *fp = NULL;
char *cmdline = NULL;
- char path[24]; /* Can't go bigger than /proc/65535/cmdline */
+ char path[20]; /* Can't go bigger than /proc/65535/cmdline */
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");
+ 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;
}
const char *active_string(int value)
{
switch (value) {
- case 0: return " [inactive]";
- case 1: return " [active]";
+ case 0: return "inactive";
+ case 1: return "active";
case -1: return "";
default: return NULL;
}
}
+static const char *snapshot_string(int value)
+{
+ switch (value) {
+ case 1:
+ return " snapshot";
+ default:
+ return "";
+ }
+}
+
static
const char *enabled_string(int value)
{
}
static
-const char *loglevel_string_pre(const char *loglevel)
+const char *filter_string(int value)
{
- if (loglevel[0] == '\0') {
- return "";
- } else {
- return " (loglevel: ";
+ switch (value) {
+ case 1: return " [with filter]";
+ default: return "";
}
}
static
-const char *loglevel_string_post(const char *loglevel)
+const char *exclusion_string(int value)
{
- if (loglevel[0] == '\0') {
- return "";
+ switch (value) {
+ case 1: return " [has exclusions]";
+ default: return "";
+ }
+}
+
+static const char *logleveltype_string(enum lttng_loglevel_type value)
+{
+ switch (value) {
+ case LTTNG_EVENT_LOGLEVEL_ALL:
+ return ":";
+ case LTTNG_EVENT_LOGLEVEL_RANGE:
+ return " <=";
+ case LTTNG_EVENT_LOGLEVEL_SINGLE:
+ return " ==";
+ default:
+ return " <<TYPE UNKN>>";
+ }
+}
+
+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 ")";
+ return "";
}
}
switch (event->type) {
case LTTNG_EVENT_TRACEPOINT:
{
- char ll_value[LTTNG_SYMBOL_NAME_LEN] = "";
-
- if (event->loglevel[0] != '\0') {
- int ret;
-
- ret = snprintf(ll_value, LTTNG_SYMBOL_NAME_LEN,
- " (%lld)", (long long) event->loglevel_value);
- if (ret < 0)
- ERR("snprintf error");
- }
- MSG("%s%s%s%s%s%s (type: tracepoint)%s", indent6,
+ if (event->loglevel != -1) {
+ MSG("%s%s (loglevel%s %s (%d)) (type: tracepoint)%s%s%s",
+ indent6,
event->name,
- loglevel_string_pre(event->loglevel),
+ logleveltype_string(event->loglevel_type),
+ mi_lttng_loglevel_string(event->loglevel, handle->domain.type),
event->loglevel,
- ll_value,
- loglevel_string_post(event->loglevel),
- enabled_string(event->enabled));
+ enabled_string(event->enabled),
+ exclusion_string(event->exclusion),
+ filter_string(event->filter));
+ } else {
+ MSG("%s%s (type: tracepoint)%s%s%s",
+ indent6,
+ event->name,
+ enabled_string(event->enabled),
+ exclusion_string(event->exclusion),
+ filter_string(event->filter));
+ }
break;
}
+ case LTTNG_EVENT_FUNCTION:
+ MSG("%s%s (type: function)%s%s", indent6,
+ event->name, enabled_string(event->enabled),
+ filter_string(event->filter));
+ if (event->attr.probe.addr != 0) {
+ MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
+ } else {
+ MSG("%soffset: 0x%" PRIx64, indent8, event->attr.probe.offset);
+ MSG("%ssymbol: %s", indent8, event->attr.probe.symbol_name);
+ }
+ break;
case LTTNG_EVENT_PROBE:
- MSG("%s%s (type: probe)%s", indent6,
- event->name, enabled_string(event->enabled));
+ MSG("%s%s (type: probe)%s%s", indent6,
+ event->name, enabled_string(event->enabled),
+ filter_string(event->filter));
if (event->attr.probe.addr != 0) {
MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr);
} else {
MSG("%ssymbol: %s", indent8, event->attr.probe.symbol_name);
}
break;
- case LTTNG_EVENT_FUNCTION:
case LTTNG_EVENT_FUNCTION_ENTRY:
- MSG("%s%s (type: function)%s", indent6,
- event->name, enabled_string(event->enabled));
+ MSG("%s%s (type: function)%s%s", indent6,
+ event->name, enabled_string(event->enabled),
+ filter_string(event->filter));
MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
break;
case LTTNG_EVENT_SYSCALL:
- MSG("%s (type: syscall)%s", indent6,
- enabled_string(event->enabled));
+ MSG("%s%s%s%s%s", indent6, event->name,
+ (opt_syscall ? "" : " (type:syscall)"),
+ enabled_string(event->enabled),
+ bitness_event(event->flags));
break;
case LTTNG_EVENT_NOOP:
- MSG("%s (type: noop)%s", indent6,
- enabled_string(event->enabled));
- break;
- case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
- MSG("%s%s (type: tracepoint loglevel)%s", indent6,
- event->name,
- enabled_string(event->enabled));
+ MSG("%s (type: noop)%s%s", indent6,
+ enabled_string(event->enabled),
+ filter_string(event->filter));
break;
case LTTNG_EVENT_ALL:
/* We should never have "all" events in list. */
}
}
+static const char *field_type(struct lttng_event_field *field)
+{
+ switch(field->type) {
+ case LTTNG_EVENT_FIELD_INTEGER:
+ return "integer";
+ case LTTNG_EVENT_FIELD_ENUM:
+ return "enum";
+ case LTTNG_EVENT_FIELD_FLOAT:
+ return "float";
+ case LTTNG_EVENT_FIELD_STRING:
+ return "string";
+ case LTTNG_EVENT_FIELD_OTHER:
+ default: /* fall-through */
+ return "unknown";
+ }
+}
+
/*
- * Ask session daemon for all user space tracepoints available.
+ * Pretty print single event fields.
*/
-static int list_ust_events(void)
+static void print_event_field(struct lttng_event_field *field)
+{
+ if (!field->field_name[0]) {
+ return;
+ }
+ MSG("%sfield: %s (%s)%s", indent8, field->field_name,
+ field_type(field), field->nowrite ? " [no write]" : "");
+}
+
+/*
+ * 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;
+ const char *agent_domain_str;
+
+ memset(&domain, 0, sizeof(domain));
+ 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;
+ }
- DBG("Getting UST tracing events");
+ agent_domain_str = get_domain_str(domain.type);
- domain.type = LTTNG_DOMAIN_UST;
+ 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 UST events");
- return size;
- }
-
- MSG("UST events:\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;
- MSG("\nPID: %d - Name: %s", cur_pid, get_cmdline_by_pid(cur_pid));
+ if (lttng_opt_mi) {
+ /* Mi print */
+ ret = mi_list_agent_ust_events(event_list, size, &domain);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto error;
}
- print_events(&event_list[i]);
- }
+ } else {
+ /* Pretty print */
+ MSG("%s events (Logger name):\n-------------------------",
+ agent_domain_str);
- MSG("");
+ if (size == 0) {
+ MSG("None");
+ }
- free(event_list);
+ 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:
- return -1;
+ free(event_list);
+end:
+ lttng_destroy_handle(handle);
+ return ret;
}
/*
- * Ask for all trace events in the kernel and pretty print them.
+ * Ask session daemon for all user space tracepoints available.
*/
-static int list_kernel_events(void)
+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;
+ pid_t cur_pid = 0;
+ char *cmdline = NULL;
- DBG("Getting kernel tracing events");
+ memset(&domain, 0, sizeof(domain));
- domain.type = LTTNG_DOMAIN_KERNEL;
+ DBG("Getting UST tracing events");
+
+ domain.type = LTTNG_DOMAIN_UST;
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 kernel events");
- return size;
+ ERR("Unable to list UST events: %s", lttng_strerror(size));
+ ret = CMD_ERROR;
+ goto error;
}
- MSG("Kernel events:\n-------------");
-
- for (i = 0; i < size; i++) {
- print_events(&event_list[i]);
- }
+ if (lttng_opt_mi) {
+ /* Mi print */
+ ret = mi_list_agent_ust_events(event_list, size, &domain);
+ } else {
+ /* Pretty print */
+ MSG("UST events:\n-------------");
- MSG("");
+ if (size == 0) {
+ MSG("None");
+ }
- free(event_list);
+ 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]);
+ }
- return CMD_SUCCESS;
+ MSG("");
+ }
error:
- return -1;
+ free(event_list);
+end:
+ lttng_destroy_handle(handle);
+ return ret;
}
/*
- * List events of channel of session and domain.
+ * Machine interface
+ * List all ust event with their fields
*/
-static int list_events(const char *channel_name)
+static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
+ struct lttng_domain *domain)
{
- int ret, count, i;
- struct lttng_event *events = NULL;
+ 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;
- count = lttng_list_events(handle, channel_name, &events);
- if (count < 0) {
- ret = count;
- goto error;
+ /* Open domains element */
+ ret = mi_lttng_domains_open(writer);
+ if (ret) {
+ goto end;
}
- MSG("\n%sEvents:", indent4);
- if (count == 0) {
- MSG("%sNone\n", indent6);
+ /* Write domain */
+ ret = mi_lttng_domain(writer, domain, 1);
+ if (ret) {
goto end;
}
- for (i = 0; i < count; i++) {
- print_events(&events[i]);
+ /* Open pids element */
+ ret = mi_lttng_pids_open(writer);
+ if (ret) {
+ goto end;
}
- MSG("");
+ 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);
+ if (!pid_element_open) {
+ /* Open and write a pid element */
+ ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
+ if (ret) {
+ goto error;
+ }
-end:
- if (events) {
- free(events);
+ /* 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));
+ }
+
+ 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));
+
+ 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;
+ }
+ }
+
+ /* Print the event_field */
+ ret = mi_lttng_event_field(writer, &fields[i]);
+ if (ret) {
+ goto end;
+ }
}
- ret = CMD_SUCCESS;
+ /* Close pids, domain, domains */
+ ret = mi_lttng_close_multi_element(writer, 3);
+end:
+ return ret;
error:
+ free(cmdline);
return ret;
}
/*
- * Pretty print channel
+ * Ask session daemon for all user space tracepoint fields available.
*/
-static void print_channel(struct lttng_channel *channel)
+static int list_ust_event_fields(void)
{
- MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled));
+ int i, size, ret = CMD_SUCCESS;
+ struct lttng_domain domain;
+ struct lttng_handle *handle;
+ struct lttng_event_field *event_field_list;
+ pid_t cur_pid = 0;
+ char *cmdline = NULL;
- MSG("%sAttributes:", indent4);
- MSG("%soverwrite mode: %d", indent6, channel->attr.overwrite);
- MSG("%ssubbufers size: %" PRIu64, indent6, channel->attr.subbuf_size);
- MSG("%snumber of subbufers: %" PRIu64, indent6, channel->attr.num_subbuf);
- MSG("%sswitch timer interval: %u", indent6, channel->attr.switch_timer_interval);
- MSG("%sread timer interval: %u", indent6, channel->attr.read_timer_interval);
- switch (channel->attr.output) {
- case LTTNG_EVENT_SPLICE:
- MSG("%soutput: splice()", indent6);
- break;
- case LTTNG_EVENT_MMAP:
- MSG("%soutput: mmap()", indent6);
- break;
- }
-}
+ struct lttng_event cur_event;
-/*
- * List channel(s) of session and domain.
- *
- * If channel_name is NULL, all channels are listed.
- */
-static int list_channels(const char *channel_name)
-{
- int count, i, ret = CMD_SUCCESS;
- unsigned int chan_found = 0;
- struct lttng_channel *channels = NULL;
+ memset(&domain, 0, sizeof(domain));
+ memset(&cur_event, 0, sizeof(cur_event));
- DBG("Listing channel(s) (%s)", channel_name ? : "<all>");
+ DBG("Getting UST tracing event fields");
- count = lttng_list_channels(handle, &channels);
- if (count < 0) {
- ret = count;
- goto error;
- } else if (count == 0) {
- MSG("No channel found");
+ domain.type = LTTNG_DOMAIN_UST;
+
+ handle = lttng_create_handle(NULL, &domain);
+ if (handle == NULL) {
+ ret = CMD_ERROR;
goto end;
}
- if (channel_name == NULL) {
- MSG("Channels:\n-------------");
+ size = lttng_list_tracepoint_fields(handle, &event_field_list);
+ if (size < 0) {
+ ERR("Unable to list UST event fields: %s", lttng_strerror(size));
+ ret = CMD_ERROR;
+ goto end;
}
- 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;
- }
+ if (lttng_opt_mi) {
+ /* Mi print */
+ ret = mi_list_ust_event_fields(event_field_list, size, &domain);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto error;
}
- print_channel(&channels[i]);
+ } else {
+ /* Pretty print */
+ MSG("UST events:\n-------------");
- /* Listing events per channel */
- ret = list_events(channels[i].name);
- if (ret < 0) {
- MSG("%s", lttng_strerror(ret));
+ if (size == 0) {
+ MSG("None");
}
- if (chan_found) {
- break;
+ 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]);
}
- }
- if (!chan_found && channel_name != NULL) {
- MSG("Channel %s not found", channel_name);
+ MSG("");
}
-end:
- free(channels);
- ret = CMD_SUCCESS;
-
error:
+ free(event_field_list);
+end:
+ lttng_destroy_handle(handle);
return ret;
}
/*
- * List available tracing session. List only basic information.
- *
- * If session_name is NULL, all sessions are listed.
+ * Machine interface
+ * Print a list of kernel events
*/
-static int list_sessions(const char *session_name)
+static int mi_list_kernel_events(struct lttng_event *events, int count,
+ struct lttng_domain *domain)
{
- int ret, count, i;
- unsigned int session_found = 0;
- struct lttng_session *sessions;
+ int ret, i;
- count = lttng_list_sessions(&sessions);
- DBG("Session count %d", count);
- if (count < 0) {
- ret = count;
+ /* 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 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
+ */
+static int list_kernel_events(void)
+{
+ int i, size, ret = CMD_SUCCESS;
+ struct lttng_domain domain;
+ struct lttng_handle *handle;
+ struct lttng_event *event_list;
+
+ memset(&domain, 0, sizeof(domain));
+
+ DBG("Getting kernel tracing events");
+
+ domain.type = LTTNG_DOMAIN_KERNEL;
+
+ handle = lttng_create_handle(NULL, &domain);
+ if (handle == NULL) {
+ ret = CMD_ERROR;
goto error;
}
- if (session_name == NULL) {
- MSG("Available tracing sessions:");
+ size = lttng_list_tracepoints(handle, &event_list);
+ if (size < 0) {
+ ERR("Unable to list kernel events: %s", lttng_strerror(size));
+ lttng_destroy_handle(handle);
+ return CMD_ERROR;
+ }
+
+ 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]);
+ }
+
+ MSG("");
+ }
+
+end:
+ free(event_list);
+
+ lttng_destroy_handle(handle);
+ return ret;
+
+error:
+ lttng_destroy_handle(handle);
+ return ret;
+}
+
+/*
+ * Machine interface
+ * Print a list of system calls.
+ */
+static int mi_list_syscalls(struct lttng_event *events, int count)
+{
+ int ret, i;
+
+ /* Open events */
+ ret = mi_lttng_events_open(writer);
+ if (ret) {
+ 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", session_name, active_string(sessions[i].enabled));
- MSG("%sTrace path: %s\n", indent4, sessions[i].path);
- break;
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
+ if (ret) {
+ goto end;
+ }
+ }
+
+ /* Close events. */
+ ret = mi_lttng_writer_close_element(writer);
+ if (ret) {
+ goto end;
+ }
+
+end:
+ return ret;
+}
+
+/*
+ * Ask for kernel system calls.
+ */
+static int list_syscalls(void)
+{
+ int i, size, ret = CMD_SUCCESS;
+ struct lttng_event *event_list;
+
+ 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;
+ }
+
+ 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++) {
+ 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 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);
+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;
+}
+
+/*
+ * Pretty print channel
+ */
+static void print_channel(struct lttng_channel *channel)
+{
+ MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled));
+
+ MSG("%sAttributes:", indent4);
+ MSG("%soverwrite mode: %d", indent6, channel->attr.overwrite);
+ MSG("%ssubbufers size: %" PRIu64, indent6, channel->attr.subbuf_size);
+ MSG("%snumber of subbufers: %" PRIu64, indent6, channel->attr.num_subbuf);
+ MSG("%sswitch timer interval: %u", indent6, channel->attr.switch_timer_interval);
+ MSG("%sread timer interval: %u", indent6, channel->attr.read_timer_interval);
+ MSG("%strace file count: %" PRIu64, indent6, channel->attr.tracefile_count);
+ MSG("%strace file size (bytes): %" PRIu64, indent6, channel->attr.tracefile_size);
+ switch (channel->attr.output) {
+ case LTTNG_EVENT_SPLICE:
+ MSG("%soutput: splice()", indent6);
+ break;
+ case LTTNG_EVENT_MMAP:
+ MSG("%soutput: mmap()", indent6);
+ break;
+ }
+}
+
+/*
+ * 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;
}
- continue;
}
- MSG(" %d) %s (%s)%s", i + 1, sessions[i].name, sessions[i].path, active_string(sessions[i].enabled));
+ /* 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 (session_found) {
+ if (chan_found) {
break;
}
}
- free(sessions);
+ /* Close channels element */
+ ret = mi_lttng_writer_close_element(writer);
+ if (ret) {
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * List channel(s) of session and domain.
+ *
+ * If channel_name is NULL, all channels are listed.
+ */
+static int list_channels(const char *channel_name)
+{
+ int count, i, ret = CMD_SUCCESS;
+ unsigned int chan_found = 0;
+ struct lttng_channel *channels = NULL;
+
+ DBG("Listing channel(s) (%s)", channel_name ? : "<all>");
+
+ count = lttng_list_channels(handle, &channels);
+ if (count < 0) {
+ switch (-count) {
+ case LTTNG_ERR_KERN_CHAN_NOT_FOUND:
+ 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 = CMD_ERROR;
+ ERR("%s", lttng_strerror(count));
+ goto error_channels;
+ break;
+ }
+ }
+
+ 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;
+ }
+ }
+ print_channel(&channels[i]);
+
+ /* Listing events per channel */
+ ret = list_events(channels[i].name);
+ if (ret) {
+ goto error;
+ }
+
+ if (chan_found) {
+ break;
+ }
+ }
+
+ 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: [");
- if (!session_found && session_name != NULL) {
- MSG("Session %s not found", session_name);
+ 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
+ * 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) {
- MSG("\nUse lttng list <session_name> for more details");
+ 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 (!session_found) {
+ ERR("Session '%s' not found", session_name);
+ ret = -LTTNG_ERR_SESS_NOT_FOUND;
+ goto end;
+ }
+
+end:
+ return ret;
+}
+
+/*
+ * Machine interface
+ * List all availables session
+ */
+static int mi_list_sessions(struct lttng_session *sessions, int count)
+{
+ int ret, i;
+
+ /* 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;
+}
+
+/*
+ * List available tracing session. List only basic information.
+ *
+ * If session_name is NULL, all sessions are listed.
+ */
+static int list_sessions(const char *session_name)
+{
+ 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 = CMD_ERROR;
+ ERR("%s", lttng_strerror(count));
+ goto end;
}
- return CMD_SUCCESS;
+ 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;
+ }
+
+ 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);
+ if (sessions[i].live_timer_interval != 0) {
+ MSG("%sLive timer interval (usec): %u", indent4,
+ sessions[i].live_timer_interval);
+ }
+ MSG("");
+ }
+ }
+
+ 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 <session_name> for more details");
+ }
+ }
error:
+ free(sessions);
+end:
+ return ret;
+}
+
+
+/*
+ * 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;
+ }
+
+ 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 ret;
}
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;
- 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;
- 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;
}
*/
int cmd_list(int argc, const char **argv)
{
- int opt, i, ret = CMD_SUCCESS;
- int nb_domain;
+ int opt, ret = CMD_SUCCESS;
const char *session_name;
static poptContext pc;
struct lttng_domain domain;
struct lttng_domain *domains = NULL;
+ memset(&domain, 0, sizeof(domain));
+
if (argc < 1) {
usage(stderr);
+ ret = CMD_ERROR;
goto end;
}
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
case OPT_HELP:
- usage(stderr);
+ usage(stdout);
goto end;
case OPT_USERSPACE:
opt_userspace = 1;
break;
+ case OPT_LIST_OPTIONS:
+ list_cmd_options(stdout, long_options);
+ goto end;
default:
usage(stderr);
ret = CMD_UNDEFINED;
}
}
- if (opt_pid != 0) {
- MSG("*** Userspace tracing not implemented for PID ***\n");
+ /* 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) */
} else if (opt_userspace) {
DBG2("Listing userspace global domain");
domain.type = LTTNG_DOMAIN_UST;
+ } 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;
}
- handle = lttng_create_handle(session_name, &domain);
- if (handle == NULL) {
+ 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 || opt_log4j || opt_python) {
+ handle = lttng_create_handle(session_name, &domain);
+ if (handle == NULL) {
+ ret = CMD_FATAL;
+ goto end;
+ }
+ }
+
if (session_name == NULL) {
- if (!opt_kernel && !opt_userspace) {
+ 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) {
- goto end;
+ if (opt_syscall) {
+ ret = list_syscalls();
+ if (ret) {
+ goto end;
+ }
+ } else {
+ ret = list_kernel_events();
+ if (ret) {
+ goto end;
+ }
}
}
if (opt_userspace) {
- ret = list_ust_events();
- if (ret < 0) {
+ if (opt_fields) {
+ ret = list_ust_event_fields();
+ } else {
+ ret = list_ust_events();
+ }
+ if (ret) {
+ goto end;
+ }
+ }
+ 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;
}
goto end;
}
- if (opt_kernel) {
- /* Channel listing */
+ /* Channel listing */
+ if (opt_kernel || opt_userspace) {
+ 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;
+ 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:
break;
case LTTNG_DOMAIN_UST:
MSG("=== Domain: UST global ===\n");
+ MSG("Buffer type: %s\n",
+ domains[i].buf_type ==
+ LTTNG_BUFFER_PER_PID ? "per PID" : "per UID");
+ break;
+ 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 */
- lttng_destroy_handle(handle);
+ if (handle) {
+ lttng_destroy_handle(handle);
+ }
handle = lttng_create_handle(session_name, &domains[i]);
if (handle == NULL) {
+ ret = CMD_FATAL;
goto end;
}
+ 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:
- if (domains) {
- free(domains);
+ /* 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);
}
- lttng_destroy_handle(handle);
+ poptFreeContext(pc);
return ret;
}
projects / lttng-tools.git / blobdiff