* Returns 0 on success or else a negative code which is either -ENOMEM or
* -ENOTCONN which is the default code if the ustctl_create_session fails.
*/
-static int create_ust_app_session(struct ltt_ust_session *usess,
+static int find_or_create_ust_app_session(struct ltt_ust_session *usess,
struct ust_app *app, struct ust_app_session **ua_sess_ptr,
int *is_created)
{
* that if session exist, it will simply return a pointer to the ust
* app session.
*/
- ret = create_ust_app_session(usess, app, &ua_sess, &created);
+ ret = find_or_create_ust_app_session(usess, app, &ua_sess, &created);
if (ret < 0) {
switch (ret) {
case -ENOTCONN:
struct ust_app_ctx *ua_ctx;
int is_created = 0;
- ret = create_ust_app_session(usess, app, &ua_sess, &is_created);
+ ret = find_or_create_ust_app_session(usess, app, &ua_sess, &is_created);
if (ret < 0) {
/* Tracer is probably gone or ENOMEM. */
goto error;
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;
}
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,
usess->uid, usess->gid,
usess->consumer, pathname,
/* is_metadata_channel */ false,
- session->rotate_count,
+ session->current_archive_id,
&session->rotate_pending_relay);
if (ret < 0) {
goto error;
usess->uid, usess->gid,
usess->consumer, pathname,
/* is_metadata_channel */ true,
- session->rotate_count,
+ session->current_archive_id,
&session->rotate_pending_relay);
if (ret < 0) {
goto error;
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;
}
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,
ua_sess->euid, ua_sess->egid,
ua_sess->consumer, pathname,
/* is_metadata_channel */ false,
- session->rotate_count,
+ session->current_archive_id,
&session->rotate_pending_relay);
if (ret < 0) {
goto error;
ua_sess->euid, ua_sess->egid,
ua_sess->consumer, pathname,
/* is_metadata_channel */ true,
- session->rotate_count,
+ session->current_archive_id,
&session->rotate_pending_relay);
if (ret < 0) {
goto error;