Errors related to the kernel consumer are returned in a code path
that is only used by the userspace tracer, probably as a result
of copy-pasting code.
This patch changes the codes to the corresponding CONSUMER32/64
ones and makes them negative to honor the convention indicated
in the function's header.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
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;
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,
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;
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,