projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.lttng.org/lttng-tools
[lttng-tools.git]
/
lttng-sessiond
/
ust-app.c
diff --git
a/lttng-sessiond/ust-app.c
b/lttng-sessiond/ust-app.c
index 063a2fd0a528af211ef6ab4e82baf0acb6cc8a8b..3de826bc2d97d8ca8850735af366291a4afb6c86 100644
(file)
--- a/
lttng-sessiond/ust-app.c
+++ b/
lttng-sessiond/ust-app.c
@@
-584,7
+584,7
@@
static int create_ust_channel(struct ust_app *app,
ret = ustctl_create_channel(app->key.sock, ua_sess->handle,
(struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj);
if (ret < 0) {
ret = ustctl_create_channel(app->key.sock, ua_sess->handle,
(struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj);
if (ret < 0) {
-
DBG("Error c
reating channel %s for app (pid: %d, sock: %d) "
+
ERR("C
reating channel %s for app (pid: %d, sock: %d) "
"and session handle %d with ret %d",
ua_chan->name, app->key.pid, app->key.sock,
ua_sess->handle, ret);
"and session handle %d with ret %d",
ua_chan->name, app->key.pid, app->key.sock,
ua_sess->handle, ret);
@@
-1059,8
+1059,6
@@
static struct ust_app_channel *create_ust_app_channel(
goto error;
}
shadow_copy_channel(ua_chan, uchan);
goto error;
}
shadow_copy_channel(ua_chan, uchan);
-
- lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
} else {
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
}
} else {
ua_chan = caa_container_of(ua_chan_node, struct ust_app_channel, node);
}
@@
-1070,6
+1068,8
@@
static struct ust_app_channel *create_ust_app_channel(
goto error;
}
goto error;
}
+ lttng_ht_add_unique_str(ua_sess->channels, &ua_chan->node);
+
return ua_chan;
error:
return ua_chan;
error:
This page took
0.024452 seconds
and
4
git commands to generate.