projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify notification channel info ht destruction error log
[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 38aeaab60a9399796fbce28080686af087279803..6828660aa537a22e73a23a73c4c38665af03f2fc 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-6334,7
+6334,9
@@
int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
reg->registry->reg.ust->metadata_key,
LTTNG_DOMAIN_UST, session);
if (ret < 0) {
reg->registry->reg.ust->metadata_key,
LTTNG_DOMAIN_UST, session);
if (ret < 0) {
- ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+ ret = reg->bits_per_long == 32 ?
+ -LTTNG_ERR_UST_CONSUMER32_FAIL :
+ -LTTNG_ERR_UST_CONSUMER64_FAIL;
goto error;
}
goto error;
}
@@
-6353,7
+6355,9
@@
int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
reg_chan->consumer_key,
LTTNG_DOMAIN_UST, session);
if (ret < 0) {
reg_chan->consumer_key,
LTTNG_DOMAIN_UST, session);
if (ret < 0) {
- ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+ ret = reg->bits_per_long == 32 ?
+ -LTTNG_ERR_UST_CONSUMER32_FAIL :
+ -LTTNG_ERR_UST_CONSUMER64_FAIL;
goto error;
}
ret = consumer_rotate_channel(socket,
goto error;
}
ret = consumer_rotate_channel(socket,
@@
-6430,7
+6434,9
@@
int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
ret = rotate_add_channel_pending(registry->metadata_key,
LTTNG_DOMAIN_UST, session);
if (ret < 0) {
ret = rotate_add_channel_pending(registry->metadata_key,
LTTNG_DOMAIN_UST, session);
if (ret < 0) {
- ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+ ret = app->bits_per_long == 32 ?
+ -LTTNG_ERR_UST_CONSUMER32_FAIL :
+ -LTTNG_ERR_UST_CONSUMER64_FAIL;
goto error;
}
goto error;
}
@@
-6441,7
+6447,9
@@
int ust_app_rotate_session(struct ltt_session *session, bool *ust_active)
ua_chan->key, LTTNG_DOMAIN_UST,
session);
if (ret < 0) {
ua_chan->key, LTTNG_DOMAIN_UST,
session);
if (ret < 0) {
- ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+ ret = app->bits_per_long == 32 ?
+ -LTTNG_ERR_UST_CONSUMER32_FAIL :
+ -LTTNG_ERR_UST_CONSUMER64_FAIL;
goto error;
}
ret = consumer_rotate_channel(socket, ua_chan->key,
goto error;
}
ret = consumer_rotate_channel(socket, ua_chan->key,
This page took
0.024252 seconds
and
4
git commands to generate.