projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: libc internal mutex races with run_as
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 26845535c32f7af3805ed59bced52e2864307e21..7878a053c2aca086e63b63a331f5bacdf51160bf 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-1290,7
+1290,14
@@
int cmd_disable_event(struct ltt_session *session,
switch (event->type) {
case LTTNG_EVENT_ALL:
switch (event->type) {
case LTTNG_EVENT_ALL:
- ret = event_ust_disable_tracepoint(usess, uchan, event_name);
+ if (strlen(event->name) == 1 &&
+ !strncmp(event->name, "*", 1)) {
+ ret = event_ust_disable_all_tracepoints(usess,
+ uchan);
+ } else {
+ ret = event_ust_disable_tracepoint(usess, uchan,
+ event_name);
+ }
if (ret != LTTNG_OK) {
goto error_unlock;
}
if (ret != LTTNG_OK) {
goto error_unlock;
}
@@
-1535,13
+1542,13
@@
static int _cmd_enable_event(struct ltt_session *session,
DBG("Enable event command for event \'%s\'", event->name);
DBG("Enable event command for event \'%s\'", event->name);
+ rcu_read_lock();
+
ret = validate_event_name(event->name);
if (ret) {
goto error;
}
ret = validate_event_name(event->name);
if (ret) {
goto error;
}
- rcu_read_lock();
-
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
{
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
{
@@
-1633,9
+1640,10
@@
static int _cmd_enable_event(struct ltt_session *session,
event->type = LTTNG_EVENT_SYSCALL; /* Hack */
ret = event_kernel_enable_event(kchan, event,
filter_expression_a, filter_a);
event->type = LTTNG_EVENT_SYSCALL; /* Hack */
ret = event_kernel_enable_event(kchan, event,
filter_expression_a, filter_a);
+ /* We have passed ownership */
+ filter_expression_a = NULL;
+ filter_a = NULL;
if (ret != LTTNG_OK) {
if (ret != LTTNG_OK) {
- free(filter_expression_a);
- free(filter_a);
goto error;
}
break;
goto error;
}
break;
This page took
0.03565 seconds
and
4
git commands to generate.