case 5: return "TRACE_NOTICE";
case 6: return "TRACE_INFO";
case 7: return "TRACE_SYSTEM";
- case 8: return "TRACE_PROCESS";
- case 9: return "TRACE_MODULE";
- case 10: return "TRACE_UNIT";
- case 11: return "TRACE_CLASS";
- case 12: return "TRACE_OBJECT";
- case 13: return "TRACE_FUNCTION";
- case 14: return "TRACE_PRINTF";
+ case 8: return "TRACE_PROGRAM";
+ case 9: return "TRACE_PROCESS";
+ case 10: return "TRACE_MODULE";
+ case 11: return "TRACE_UNIT";
+ case 12: return "TRACE_FUNCTION";
+ case 13: return "TRACE_DEFAULT";
+ case 14: return "TRACE_VERBOSE";
case 15: return "TRACE_DEBUG";
default: return "<<UNKNOWN>>";
}
switch (event->type) {
case LTTNG_EVENT_TRACEPOINT:
{
- MSG("%s%s%s%s%d%s (type: tracepoint)%s", indent6,
+ MSG("%s%s%s%s%s (type: tracepoint)%s", indent6,
event->name,
loglevel_string_pre(event->loglevel),
loglevel_string(event->loglevel),
- event->loglevel,
loglevel_string_post(event->loglevel),
enabled_string(event->enabled));
break;
struct lttng_event *event_list;
pid_t cur_pid = 0;
+ memset(&domain, 0, sizeof(domain));
+
DBG("Getting UST tracing events");
domain.type = LTTNG_DOMAIN_UST;
struct lttng_handle *handle;
struct lttng_event *event_list;
+ memset(&domain, 0, sizeof(domain));
+
DBG("Getting kernel tracing events");
domain.type = LTTNG_DOMAIN_KERNEL;
continue;
}
- MSG(" %d) %s (%s)%s", i + 1, sessions[i].name, sessions[i].path, active_string(sessions[i].enabled));
+ MSG(" %d) %s (%s)%s", i + 1, sessions[i].name, sessions[i].path,
+ active_string(sessions[i].enabled));
if (session_found) {
break;
free(sessions);
if (!session_found && session_name != NULL) {
- ERR("Session %s not found", session_name);
+ ERR("Session '%s' not found", session_name);
+ ret = CMD_ERROR;
+ goto error;
}
if (session_name == NULL) {
struct lttng_domain domain;
struct lttng_domain *domains = NULL;
+ memset(&domain, 0, sizeof(domain));
+
if (argc < 1) {
usage(stderr);
ret = CMD_ERROR;
if (session_name == NULL) {
if (!opt_kernel && !opt_userspace) {
ret = list_sessions(NULL);
- if (ret < 0) {
- ret = CMD_ERROR;
+ if (ret != 0) {
goto end;
}
}
if (opt_kernel) {
ret = list_kernel_events();
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
}
if (opt_userspace) {
ret = list_ust_events();
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
}
} else {
/* List session attributes */
ret = list_sessions(session_name);
- if (ret < 0) {
- ret = CMD_ERROR;
+ if (ret != 0) {
goto end;
}
/* Domain listing */
if (opt_domain) {
ret = list_domains(session_name);
- if (ret < 0) {
- ret = CMD_ERROR;
- }
goto end;
}
/* Channel listing */
ret = list_channels(opt_channel);
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
} else {
/* We want all domain(s) */
nb_domain = lttng_list_domains(session_name, &domains);
if (nb_domain < 0) {
- ret = CMD_ERROR;
+ ret = nb_domain;
goto end;
}
ret = list_channels(opt_channel);
if (ret < 0) {
- ret = CMD_ERROR;
goto end;
}
}