projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: report UST consumer channel creation error
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.c
diff --git
a/src/bin/lttng-sessiond/ust-app.c
b/src/bin/lttng-sessiond/ust-app.c
index 4a7fadaf5231d4f3c84d33d7956f68f11dd998d5..f8e96936d172f45ae85ac5a2980f8d2020a95a80 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-2450,6
+2450,8
@@
static int create_channel_per_uid(struct ust_app *app,
/* Create the buffer registry channel object. */
ret = create_buffer_reg_channel(reg_uid->registry, ua_chan, ®_chan);
if (ret < 0) {
/* Create the buffer registry channel object. */
ret = create_buffer_reg_channel(reg_uid->registry, ua_chan, ®_chan);
if (ret < 0) {
+ ERR("Error creating the UST channel \"%s\" registry instance",
+ ua_chan->name);
goto error;
}
assert(reg_chan);
goto error;
}
assert(reg_chan);
@@
-2461,6
+2463,9
@@
static int create_channel_per_uid(struct ust_app *app,
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
app->bits_per_long, reg_uid->registry->reg.ust);
if (ret < 0) {
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
app->bits_per_long, reg_uid->registry->reg.ust);
if (ret < 0) {
+ ERR("Error creating UST channel \"%s\" on the consumer daemon",
+ ua_chan->name);
+
/*
* Let's remove the previously created buffer registry channel so
* it's not visible anymore in the session registry.
/*
* Let's remove the previously created buffer registry channel so
* it's not visible anymore in the session registry.
@@
-2477,6
+2482,8
@@
static int create_channel_per_uid(struct ust_app *app,
*/
ret = setup_buffer_reg_channel(reg_uid->registry, ua_chan, reg_chan);
if (ret < 0) {
*/
ret = setup_buffer_reg_channel(reg_uid->registry, ua_chan, reg_chan);
if (ret < 0) {
+ ERR("Error setting up UST channel \"%s\"",
+ ua_chan->name);
goto error;
}
goto error;
}
@@
-2485,6
+2492,10
@@
static int create_channel_per_uid(struct ust_app *app,
/* Send buffers to the application. */
ret = send_channel_uid_to_ust(reg_chan, app, ua_sess, ua_chan);
if (ret < 0) {
/* Send buffers to the application. */
ret = send_channel_uid_to_ust(reg_chan, app, ua_sess, ua_chan);
if (ret < 0) {
+ /*
+ * Don't report error to the console, since it may be
+ * caused by application concurrently exiting.
+ */
goto error;
}
goto error;
}
@@
-2519,6
+2530,8
@@
static int create_channel_per_pid(struct ust_app *app,
/* Create and add a new channel registry to session. */
ret = ust_registry_channel_add(registry, ua_chan->key);
if (ret < 0) {
/* Create and add a new channel registry to session. */
ret = ust_registry_channel_add(registry, ua_chan->key);
if (ret < 0) {
+ ERR("Error creating the UST channel \"%s\" registry instance",
+ ua_chan->name);
goto error;
}
goto error;
}
@@
-2526,11
+2539,17
@@
static int create_channel_per_pid(struct ust_app *app,
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
app->bits_per_long, registry);
if (ret < 0) {
ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
app->bits_per_long, registry);
if (ret < 0) {
+ ERR("Error creating UST channel \"%s\" on the consumer daemon",
+ ua_chan->name);
goto error;
}
ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
if (ret < 0) {
goto error;
}
ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
if (ret < 0) {
+ /*
+ * Don't report error to the console, since it may be
+ * caused by application concurrently exiting.
+ */
goto error;
}
goto error;
}
This page took
0.027829 seconds
and
5
git commands to generate.