/*
* 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
}
}
-static
-const char *loglevel_string_pre(int loglevel)
-{
- if (loglevel == -1) {
- return "";
- } else {
- return " (loglevel: ";
- }
-}
-
-static
-const char *loglevel_string_post(int loglevel)
-{
- if (loglevel == -1) {
- return "";
- } else {
- return ")";
- }
-}
-
static const char *loglevel_string(int value)
{
switch (value) {
- case -1: return "";
- case 0: return "TRACE_EMERG";
- case 1: return "TRACE_ALERT";
- case 2: return "TRACE_CRIT";
- case 3: return "TRACE_ERR";
- case 4: return "TRACE_WARNING";
- case 5: return "TRACE_NOTICE";
- case 6: return "TRACE_INFO";
- case 7: return "TRACE_SYSTEM";
- 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>>";
+ 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 "<<UNKNOWN>>";
}
}
switch (event->type) {
case LTTNG_EVENT_TRACEPOINT:
{
- MSG("%s%s%s%s%d%s (type: tracepoint)%s", indent6,
+ if (event->loglevel != -1) {
+ MSG("%s%s (loglevel: %s (%d)) (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));
+ } else {
+ MSG("%s%s (type: tracepoint)%s",
+ indent6,
+ event->name,
+ enabled_string(event->enabled));
+ }
break;
}
case LTTNG_EVENT_PROBE:
MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name);
break;
case LTTNG_EVENT_SYSCALL:
- MSG("%s (type: syscall)%s", indent6,
+ MSG("%ssyscalls (type: syscall)%s", indent6,
enabled_string(event->enabled));
break;
case LTTNG_EVENT_NOOP:
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;
size = lttng_list_tracepoints(handle, &event_list);
if (size < 0) {
ERR("Unable to list UST events");
+ lttng_destroy_handle(handle);
return size;
}
MSG("");
free(event_list);
+ lttng_destroy_handle(handle);
return CMD_SUCCESS;
error:
+ lttng_destroy_handle(handle);
return -1;
}
struct lttng_handle *handle;
struct lttng_event *event_list;
+ memset(&domain, 0, sizeof(domain));
+
DBG("Getting kernel tracing events");
domain.type = LTTNG_DOMAIN_KERNEL;
size = lttng_list_tracepoints(handle, &event_list);
if (size < 0) {
ERR("Unable to list kernel events");
+ lttng_destroy_handle(handle);
return size;
}
free(event_list);
+ lttng_destroy_handle(handle);
return CMD_SUCCESS;
error:
+ lttng_destroy_handle(handle);
return -1;
}
if (count < 0) {
ret = count;
goto error;
+ } else if (count == 0) {
+ MSG("Currently no available tracing session");
+ goto end;
}
if (session_name == NULL) {
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) {
MSG("\nUse lttng list <session_name> for more details");
}
+end:
return CMD_SUCCESS;
error:
struct lttng_domain domain;
struct lttng_domain *domains = NULL;
+ memset(&domain, 0, sizeof(domain));
+
if (argc < 1) {
usage(stderr);
ret = CMD_ERROR;
domain.type = LTTNG_DOMAIN_UST;
}
- handle = lttng_create_handle(session_name, &domain);
- if (handle == NULL) {
- ret = CMD_FATAL;
- goto end;
+ if (opt_kernel || opt_userspace) {
+ handle = lttng_create_handle(session_name, &domain);
+ if (handle == NULL) {
+ ret = CMD_FATAL;
+ goto end;
+ }
}
if (session_name == NULL) {
if (!opt_kernel && !opt_userspace) {
ret = list_sessions(NULL);
- if (ret < 0) {
+ if (ret != 0) {
goto end;
}
}
} else {
/* List session attributes */
ret = list_sessions(session_name);
- if (ret < 0) {
+ if (ret != 0) {
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) {
if (domains) {
free(domains);
}
- lttng_destroy_handle(handle);
+ if (handle) {
+ lttng_destroy_handle(handle);
+ }
poptFreeContext(pc);
return ret;
projects / lttng-tools.git / blobdiff