*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <inttypes.h>
#include <popt.h>
#include <stdio.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 = " ";
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}
};
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");
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 */
}
/* 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");
}
- fclose(fp);
end:
+ if (fp) {
+ fclose(fp);
+ }
return cmdline;
}
}
}
+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.
*/
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),
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,
* Machine interface
* Jul and ust event listing
*/
-static int mi_list_jul_ust_events(struct lttng_event *events, int count,
+static int mi_list_agent_ust_events(struct lttng_event *events, int count,
struct lttng_domain *domain)
{
int ret, i;
}
/* 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;
}
return ret;
}
-static int list_jul_events(void)
+static int list_agent_events(void)
{
int i, size, ret = CMD_SUCCESS;
struct lttng_domain domain;
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) {
size = lttng_list_tracepoints(handle, &event_list);
if (size < 0) {
- ERR("Unable to list JUL events: %s", lttng_strerror(size));
+ ERR("Unable to list %s events: %s", agent_domain_str,
+ lttng_strerror(size));
ret = CMD_ERROR;
goto end;
}
if (lttng_opt_mi) {
/* Mi print */
- ret = mi_list_jul_ust_events(event_list, size, &domain);
+ ret = mi_list_agent_ust_events(event_list, size, &domain);
if (ret) {
ret = CMD_ERROR;
goto error;
}
} else {
/* Pretty print */
- MSG("JUL events (Logger name):\n-------------------------");
+ MSG("%s events (Logger name):\n-------------------------",
+ agent_domain_str);
if (size == 0) {
MSG("None");
if (lttng_opt_mi) {
/* Mi print */
- ret = mi_list_jul_ust_events(event_list, size, &domain);
+ ret = mi_list_agent_ust_events(event_list, size, &domain);
} else {
/* Pretty print */
MSG("UST events:\n-------------");
if (cur_pid != fields[i].event.pid) {
if (pid_element_open) {
if (event_element_open) {
- /*
- * Close the previous fields element
- * and the previous event
- */
+
+ /* Close the previous field element and event. */
ret = mi_lttng_close_multi_element(writer, 2);
if (ret) {
goto end;
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;
}
}
for (i = 0; i < count; i++) {
- mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
if (ret) {
goto end;
}
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++) {
+ 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 jul events
+ * Print a list of agent events
*/
-static int mi_list_session_jul_events(struct lttng_event *events, int count)
+static int mi_list_session_agent_events(struct lttng_event *events, int count)
{
int ret, i;
}
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;
}
}
/*
- * List JUL events for a specific session using the handle.
+ * List agent events for a specific session using the handle.
*
* Return CMD_SUCCESS on success else a negative value.
*/
-static int list_session_jul_events(void)
+static int list_session_agent_events(void)
{
int ret = CMD_SUCCESS, count, i;
struct lttng_event *events = NULL;
if (lttng_opt_mi) {
/* Mi print */
- ret = mi_list_session_jul_events(events, count);
+ ret = mi_list_session_agent_events(events, count);
if (ret) {
ret = CMD_ERROR;
goto end;
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("");
}
for (i = 0; i < count; i++) {
- ret = mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0, handle->domain.type);
if (ret) {
goto end;
}
}
} else {
/* Pretty print */
- if (channel_name == NULL) {
+ if (count) {
MSG("Channels:\n-------------");
}
return ret;
}
+/*
+ * List tracker PID(s) of session and domain.
+ */
+static int list_tracker_pids(void)
+{
+ int 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
/* Pretty print */
if (count == 0) {
MSG("Currently no available tracing session");
- ret = CMD_ERROR;
goto end;
}
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("");
}
}
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;
}
} 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;
}
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) {
goto end;
}
}
if (opt_kernel) {
- ret = list_kernel_events();
- if (ret) {
- goto end;
+ if (opt_syscall) {
+ ret = list_syscalls();
+ if (ret) {
+ goto end;
+ }
+ } else {
+ ret = list_kernel_events();
+ if (ret) {
+ goto end;
+ }
}
}
if (opt_userspace) {
goto end;
}
}
- if (opt_jul) {
- ret = list_jul_events();
+ if (opt_jul || opt_log4j || opt_python) {
+ ret = list_agent_events();
if (ret) {
goto end;
}
}
+ ret = list_tracker_pids();
+ if (ret) {
+ goto end;
+ }
+
ret = list_channels(opt_channel);
if (ret) {
goto end;
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;
goto end;
}
- if (domains[i].type == LTTNG_DOMAIN_JUL) {
- ret = list_session_jul_events();
+ 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) {
goto end;
projects / lttng-tools.git / blobdiff