static int opt_userspace;
static int opt_kernel;
static int opt_jul;
+static int opt_log4j;
static char *opt_channel;
static int opt_domain;
static int opt_fields;
{"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0},
{"kernel", 'k', POPT_ARG_VAL, &opt_kernel, 1, 0, 0},
{"jul", 'j', POPT_ARG_VAL, &opt_jul, 1, 0, 0},
+ {"log4j", 'l', POPT_ARG_VAL, &opt_log4j, 1, 0, 0},
#if 0
/* Not implemented yet */
{"userspace", 'u', POPT_ARG_STRING | POPT_ARGFLAG_OPTIONAL, &opt_cmd_name, OPT_USERSPACE, 0, 0},
}
}
-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 "<<UNKNOWN>>";
- }
-}
-
static const char *logleveltype_string(enum lttng_loglevel_type value)
{
switch (value) {
* 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;
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;
+ }
+
+ 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;
}
for (i = 0; i < count; i++) {
- mi_lttng_event(writer, &events[i], 0);
+ ret = mi_lttng_event(writer, &events[i], 0);
if (ret) {
goto end;
}
/*
* 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;
}
/*
- * 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),
- loglevel_jul_string(events[i].loglevel));
+ mi_lttng_loglevel_string(events[i].loglevel));
}
MSG("");
/* Pretty print */
if (count == 0) {
MSG("Currently no available tracing session");
- ret = CMD_ERROR;
goto end;
}
case LTTNG_DOMAIN_JUL:
MSG(" - JUL (Java Util Logging)");
break;
+ case LTTNG_DOMAIN_LOG4J:
+ MSG(" - LOG4j (Logging for Java)");
+ 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;
}
- if (opt_kernel || opt_userspace || opt_jul) {
+ if (opt_kernel || opt_userspace || opt_jul || opt_log4j) {
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) {
ret = list_sessions(NULL);
if (ret) {
goto end;
goto end;
}
}
- if (opt_jul) {
- ret = list_jul_events();
+ if (opt_jul || opt_log4j) {
+ ret = list_agent_events();
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;
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) {
+ ret = list_session_agent_events();
if (ret) {
goto end;
}