projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix debug message channel vs session name mixup
[lttng-tools.git]
/
lttng-sessiond
/
main.c
diff --git
a/lttng-sessiond/main.c
b/lttng-sessiond/main.c
index 16dd9ab5dd10d58365f1b04558edf37afcccb71a..d1d184d89eae8915d8d8808a638ca245e0b98765 100644
(file)
--- a/
lttng-sessiond/main.c
+++ b/
lttng-sessiond/main.c
@@
-1057,6
+1057,12
@@
static void *thread_manage_apps(void *data)
goto error;
}
goto error;
}
+ /*
+ * Add channel(s) and event(s) to newly registered apps
+ * from lttng global UST domain.
+ */
+ update_ust_app(ust_cmd.sock);
+
ret = ustctl_register_done(ust_cmd.sock);
if (ret < 0) {
/*
ret = ustctl_register_done(ust_cmd.sock);
if (ret < 0) {
/*
@@
-1078,11
+1084,6
@@
static void *thread_manage_apps(void *data)
ust_cmd.sock);
}
ust_cmd.sock);
}
- /*
- * Add channel(s) and event(s) to newly registered apps
- * from lttng global UST domain.
- */
- update_ust_app(ust_cmd.sock);
break;
}
} else {
break;
}
} else {
@@
-2046,7
+2047,7
@@
static int cmd_enable_channel(struct ltt_session *session,
int ret;
struct ltt_ust_session *usess = session->ust_session;
int ret;
struct ltt_ust_session *usess = session->ust_session;
- DBG("Enabling channel %s for session %s",
session->name, attr
->name);
+ DBG("Enabling channel %s for session %s",
attr->name, session
->name);
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
switch (domain->type) {
case LTTNG_DOMAIN_KERNEL:
@@
-2095,7
+2096,7
@@
static int cmd_enable_channel(struct ltt_session *session,
/* Add channel to all registered applications */
ret = ust_app_add_channel_all(usess, uchan);
/* Add channel to all registered applications */
ret = ust_app_add_channel_all(usess, uchan);
- if (ret !=
LTTCOMM_OK
) {
+ if (ret !=
0
) {
goto error;
}
goto error;
}
This page took
0.025584 seconds
and
5
git commands to generate.