projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't start the relayd with a wrong --output dir
[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 d8c8017d83800511afa90e7223211a002e7d6481..e36238182d8f04e078d440dce4d3bee94b9c5360 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-2183,6
+2183,7
@@
static int send_channel_uid_to_ust(struct buffer_reg_channel *reg_chan,
ret = ust_consumer_send_stream_to_ust(app, ua_chan, &stream);
if (ret < 0) {
ret = ust_consumer_send_stream_to_ust(app, ua_chan, &stream);
if (ret < 0) {
+ (void) release_ust_app_stream(-1, &stream);
goto error_stream_unlock;
}
goto error_stream_unlock;
}
@@
-2536,13
+2537,6
@@
static int create_ust_app_metadata(struct ust_app_session *ua_sess,
metadata->attr.type = LTTNG_UST_CHAN_METADATA;
}
metadata->attr.type = LTTNG_UST_CHAN_METADATA;
}
- /* Get the right consumer socket for the application. */
- socket = consumer_find_socket_by_bitness(app->bits_per_long, consumer);
- if (!socket) {
- ret = -EINVAL;
- goto error_consumer;
- }
-
/* Need one fd for the channel. */
ret = lttng_fd_get(LTTNG_FD_APPS, 1);
if (ret < 0) {
/* Need one fd for the channel. */
ret = lttng_fd_get(LTTNG_FD_APPS, 1);
if (ret < 0) {
@@
-2550,6
+2544,13
@@
static int create_ust_app_metadata(struct ust_app_session *ua_sess,
goto error;
}
goto error;
}
+ /* Get the right consumer socket for the application. */
+ socket = consumer_find_socket_by_bitness(app->bits_per_long, consumer);
+ if (!socket) {
+ ret = -EINVAL;
+ goto error_consumer;
+ }
+
/*
* Keep metadata key so we can identify it on the consumer side. Assign it
* to the registry *before* we ask the consumer so we avoid the race of the
/*
* Keep metadata key so we can identify it on the consumer side. Assign it
* to the registry *before* we ask the consumer so we avoid the race of the
@@
-2571,7
+2572,6
@@
static int create_ust_app_metadata(struct ust_app_session *ua_sess,
* Safe because the metadata obj pointer is not set so the delete below
* will not put a FD back again.
*/
* Safe because the metadata obj pointer is not set so the delete below
* will not put a FD back again.
*/
- lttng_fd_put(LTTNG_FD_APPS, 1);
goto error_consumer;
}
goto error_consumer;
}
@@
-2587,7
+2587,6
@@
static int create_ust_app_metadata(struct ust_app_session *ua_sess,
* Safe because the metadata obj pointer is not set so the delete below
* will not put a FD back again.
*/
* Safe because the metadata obj pointer is not set so the delete below
* will not put a FD back again.
*/
- lttng_fd_put(LTTNG_FD_APPS, 1);
goto error_consumer;
}
goto error_consumer;
}
@@
-2595,6
+2594,7
@@
static int create_ust_app_metadata(struct ust_app_session *ua_sess,
metadata->key, app->pid);
error_consumer:
metadata->key, app->pid);
error_consumer:
+ lttng_fd_put(LTTNG_FD_APPS, 1);
delete_ust_app_channel(-1, metadata, app);
error:
return ret;
delete_ust_app_channel(-1, metadata, app);
error:
return ret;
This page took
0.026954 seconds
and
5
git commands to generate.