projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: typo in configure.ac for version check
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
enable_events.c
diff --git
a/src/bin/lttng/commands/enable_events.c
b/src/bin/lttng/commands/enable_events.c
index 2af85fe476eb74abaf71ea7b456a6ee1723408b1..26195af5a7582cd7c6afccda6a1d3827d6d1bd07 100644
(file)
--- a/
src/bin/lttng/commands/enable_events.c
+++ b/
src/bin/lttng/commands/enable_events.c
@@
-113,11
+113,11
@@
static void usage(FILE *ofp)
fprintf(ofp, " e.g.:\n");
fprintf(ofp, " \"*\"\n");
fprintf(ofp, " \"app_component:na*\"\n");
fprintf(ofp, " e.g.:\n");
fprintf(ofp, " \"*\"\n");
fprintf(ofp, " \"app_component:na*\"\n");
- fprintf(ofp, " --probe
[addr | symbol | symbol+offset]
\n");
+ fprintf(ofp, " --probe
(addr | symbol | symbol+offset)
\n");
fprintf(ofp, " Dynamic probe.\n");
fprintf(ofp, " Addr and offset can be octal (0NNN...),\n");
fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n");
fprintf(ofp, " Dynamic probe.\n");
fprintf(ofp, " Addr and offset can be octal (0NNN...),\n");
fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n");
- fprintf(ofp, " --function
[addr | symbol | symbol+offset]
\n");
+ fprintf(ofp, " --function
(addr | symbol | symbol+offset)
\n");
fprintf(ofp, " Dynamic function entry/return probe.\n");
fprintf(ofp, " Addr and offset can be octal (0NNN...),\n");
fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n");
fprintf(ofp, " Dynamic function entry/return probe.\n");
fprintf(ofp, " Addr and offset can be octal (0NNN...),\n");
fprintf(ofp, " decimal (NNN...) or hexadecimal (0xNNN...)\n");
@@
-168,7
+168,7
@@
static void usage(FILE *ofp)
fprintf(ofp, " Expression examples:.\n");
fprintf(ofp, " \n");
fprintf(ofp, " 'intfield > 500 && intfield < 503'\n");
fprintf(ofp, " Expression examples:.\n");
fprintf(ofp, " \n");
fprintf(ofp, " 'intfield > 500 && intfield < 503'\n");
- fprintf(ofp, " '(str
ing
field == \"test\" || intfield != 10) && intfield > 33'\n");
+ fprintf(ofp, " '(strfield == \"test\" || intfield != 10) && intfield > 33'\n");
fprintf(ofp, " 'doublefield > 1.1 && intfield < 5.3'\n");
fprintf(ofp, " \n");
fprintf(ofp, " Wildcards are allowed at the end of strings:\n");
fprintf(ofp, " 'doublefield > 1.1 && intfield < 5.3'\n");
fprintf(ofp, " \n");
fprintf(ofp, " Wildcards are allowed at the end of strings:\n");
@@
-268,7
+268,11
@@
int loglevel_str_to_value(const char *inputstr)
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
int i = 0;
char str[LTTNG_SYMBOL_NAME_LEN];
- while (i < LTTNG_SYMBOL_NAME_LEN && inputstr[i] != '\0') {
+ /*
+ * Loop up to LTTNG_SYMBOL_NAME_LEN minus one because the NULL bytes is
+ * added at the end of the loop so a the upper bound we avoid the overflow.
+ */
+ while (i < (LTTNG_SYMBOL_NAME_LEN - 1) && inputstr[i] != '\0') {
str[i] = toupper(inputstr[i]);
i++;
}
str[i] = toupper(inputstr[i]);
i++;
}
@@
-308,12
+312,24
@@
int loglevel_str_to_value(const char *inputstr)
}
}
}
}
+static
+const char *print_channel_name(const char *name)
+{
+ return name ? : DEFAULT_CHANNEL_NAME;
+}
+
+static
+const char *print_raw_channel_name(const char *name)
+{
+ return name ? : "<default>";
+}
+
/*
* Enabling event using the lttng API.
*/
static int enable_events(char *session_name)
{
/*
* Enabling event using the lttng API.
*/
static int enable_events(char *session_name)
{
- int
err,
ret = CMD_SUCCESS, warn = 0;
+ int ret = CMD_SUCCESS, warn = 0;
char *event_name, *channel_name = NULL;
struct lttng_event ev;
struct lttng_domain dom;
char *event_name, *channel_name = NULL;
struct lttng_event ev;
struct lttng_domain dom;
@@
-336,22
+352,14
@@
static int enable_events(char *session_name)
} else if (opt_userspace) {
dom.type = LTTNG_DOMAIN_UST;
/* Default. */
} else if (opt_userspace) {
dom.type = LTTNG_DOMAIN_UST;
/* Default. */
- dom.buf_type = LTTNG_BUFFER_PER_
P
ID;
+ dom.buf_type = LTTNG_BUFFER_PER_
U
ID;
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
ret = CMD_ERROR;
goto error;
}
} else {
ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
ret = CMD_ERROR;
goto error;
}
- if (opt_channel_name == NULL) {
- err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME);
- if (err < 0) {
- ret = CMD_FATAL;
- goto error;
- }
- } else {
- channel_name = opt_channel_name;
- }
+ channel_name = opt_channel_name;
handle = lttng_create_handle(session_name, &dom);
if (handle == NULL) {
handle = lttng_create_handle(session_name, &dom);
if (handle == NULL) {
@@
-388,11
+396,15
@@
static int enable_events(char *session_name)
switch (-ret) {
case LTTNG_ERR_KERN_EVENT_EXIST:
WARN("Kernel events already enabled (channel %s, session %s)",
switch (-ret) {
case LTTNG_ERR_KERN_EVENT_EXIST:
WARN("Kernel events already enabled (channel %s, session %s)",
-
channel_name
, session_name);
+
print_channel_name(channel_name)
, session_name);
break;
default:
ERR("Events: %s (channel %s, session %s)",
break;
default:
ERR("Events: %s (channel %s, session %s)",
- lttng_strerror(ret), channel_name, session_name);
+ lttng_strerror(ret),
+ ret == -LTTNG_ERR_NEED_CHANNEL_NAME
+ ? print_raw_channel_name(channel_name)
+ : print_channel_name(channel_name),
+ session_name);
break;
}
goto end;
break;
}
goto end;
@@
-402,28
+414,32
@@
static int enable_events(char *session_name)
case LTTNG_EVENT_TRACEPOINT:
if (opt_loglevel) {
MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
case LTTNG_EVENT_TRACEPOINT:
if (opt_loglevel) {
MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
- opt_kernel ? "kernel" : "UST", channel_name,
+ opt_kernel ? "kernel" : "UST",
+ print_channel_name(channel_name),
opt_loglevel);
} else {
MSG("All %s tracepoints are enabled in channel %s",
opt_loglevel);
} else {
MSG("All %s tracepoints are enabled in channel %s",
- opt_kernel ? "kernel" : "UST", channel_name);
+ opt_kernel ? "kernel" : "UST",
+ print_channel_name(channel_name));
}
break;
case LTTNG_EVENT_SYSCALL:
if (opt_kernel) {
MSG("All kernel system calls are enabled in channel %s",
}
break;
case LTTNG_EVENT_SYSCALL:
if (opt_kernel) {
MSG("All kernel system calls are enabled in channel %s",
-
channel_name
);
+
print_channel_name(channel_name)
);
}
break;
case LTTNG_EVENT_ALL:
if (opt_loglevel) {
MSG("All %s events are enabled in channel %s for loglevel %s",
}
break;
case LTTNG_EVENT_ALL:
if (opt_loglevel) {
MSG("All %s events are enabled in channel %s for loglevel %s",
- opt_kernel ? "kernel" : "UST", channel_name,
+ opt_kernel ? "kernel" : "UST",
+ print_channel_name(channel_name),
opt_loglevel);
} else {
MSG("All %s events are enabled in channel %s",
opt_loglevel);
} else {
MSG("All %s events are enabled in channel %s",
- opt_kernel ? "kernel" : "UST", channel_name);
+ opt_kernel ? "kernel" : "UST",
+ print_channel_name(channel_name));
}
break;
default:
}
break;
default:
@@
-440,14
+456,17
@@
static int enable_events(char *session_name)
if (ret < 0) {
switch (-ret) {
case LTTNG_ERR_FILTER_EXIST:
if (ret < 0) {
switch (-ret) {
case LTTNG_ERR_FILTER_EXIST:
- WARN("Filter on events is already enabled"
+ WARN("Filter on
all
events is already enabled"
" (channel %s, session %s)",
" (channel %s, session %s)",
-
channel_name
, session_name);
+
print_channel_name(channel_name)
, session_name);
break;
break;
- case LTTNG_ERR_FILTER_INVAL:
- case LTTNG_ERR_FILTER_NOMEM:
default:
default:
- ERR("%s", lttng_strerror(ret));
+ ERR("All events: %s (channel %s, session %s, filter \'%s\')",
+ lttng_strerror(ret),
+ ret == -LTTNG_ERR_NEED_CHANNEL_NAME
+ ? print_raw_channel_name(channel_name)
+ : print_channel_name(channel_name),
+ session_name, opt_filter);
break;
}
goto error;
break;
}
goto error;
@@
-469,7
+488,8
@@
static int enable_events(char *session_name)
/* Kernel tracer action */
if (opt_kernel) {
DBG("Enabling kernel event %s for channel %s",
/* Kernel tracer action */
if (opt_kernel) {
DBG("Enabling kernel event %s for channel %s",
- event_name, channel_name);
+ event_name,
+ print_channel_name(channel_name));
switch (opt_event_type) {
case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
switch (opt_event_type) {
case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
@@
-524,7
+544,7
@@
static int enable_events(char *session_name)
#endif
DBG("Enabling UST event %s for channel %s, loglevel %s", event_name,
#endif
DBG("Enabling UST event %s for channel %s, loglevel %s", event_name,
-
channel_name
, opt_loglevel ? : "<all>");
+
print_channel_name(channel_name)
, opt_loglevel ? : "<all>");
switch (opt_event_type) {
case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
switch (opt_event_type) {
case LTTNG_EVENT_ALL: /* Default behavior is tracepoint */
@@
-569,17
+589,23
@@
static int enable_events(char *session_name)
switch (-ret) {
case LTTNG_ERR_KERN_EVENT_EXIST:
WARN("Kernel event %s already enabled (channel %s, session %s)",
switch (-ret) {
case LTTNG_ERR_KERN_EVENT_EXIST:
WARN("Kernel event %s already enabled (channel %s, session %s)",
- event_name, channel_name, session_name);
+ event_name,
+ print_channel_name(channel_name), session_name);
break;
default:
ERR("Event %s: %s (channel %s, session %s)", event_name,
break;
default:
ERR("Event %s: %s (channel %s, session %s)", event_name,
- lttng_strerror(ret), channel_name, session_name);
+ lttng_strerror(ret),
+ ret == -LTTNG_ERR_NEED_CHANNEL_NAME
+ ? print_raw_channel_name(channel_name)
+ : print_channel_name(channel_name),
+ session_name);
break;
}
warn = 1;
} else {
MSG("%s event %s created in channel %s",
break;
}
warn = 1;
} else {
MSG("%s event %s created in channel %s",
- opt_kernel ? "kernel": "UST", event_name, channel_name);
+ opt_kernel ? "kernel": "UST", event_name,
+ print_channel_name(channel_name));
}
}
}
}
@@
-591,14
+617,16
@@
static int enable_events(char *session_name)
case LTTNG_ERR_FILTER_EXIST:
WARN("Filter on event %s is already enabled"
" (channel %s, session %s)",
case LTTNG_ERR_FILTER_EXIST:
WARN("Filter on event %s is already enabled"
" (channel %s, session %s)",
- event_name, channel_name, session_name);
+ event_name,
+ print_channel_name(channel_name), session_name);
break;
break;
- case LTTNG_ERR_FILTER_INVAL:
- case LTTNG_ERR_FILTER_NOMEM:
- ERR("%s", lttng_strerror(ret));
default:
default:
- ERR("Setting filter for event %s: '%s'", ev.name,
- opt_filter);
+ ERR("Event %s: %s (channel %s, session %s, filter \'%s\')", ev.name,
+ lttng_strerror(ret),
+ ret == -LTTNG_ERR_NEED_CHANNEL_NAME
+ ? print_raw_channel_name(channel_name)
+ : print_channel_name(channel_name),
+ session_name, opt_filter);
break;
}
goto error;
break;
}
goto error;
@@
-616,9
+644,6
@@
error:
if (warn) {
ret = CMD_WARNING;
}
if (warn) {
ret = CMD_WARNING;
}
- if (opt_channel_name == NULL) {
- free(channel_name);
- }
lttng_destroy_handle(handle);
return ret;
lttng_destroy_handle(handle);
return ret;
This page took
0.040043 seconds
and
4
git commands to generate.