projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer double-close on error
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index 7f01de9ea55516223a78fc885886aa774485f934..72b68bb7f7bed39d03ed5860381ef70d94df5ad8 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-61,7
+61,7
@@
static char *setup_trace_path(struct consumer_output *consumer,
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
- ret = snprintf(pathname, PATH_MAX, "%s
/%s/
%s",
+ ret = snprintf(pathname, PATH_MAX, "%s
%s
%s",
consumer->dst.trace_path, consumer->subdir, ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
consumer->dst.trace_path, consumer->subdir, ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
@@
-78,7
+78,7
@@
static char *setup_trace_path(struct consumer_output *consumer,
}
}
} else {
}
}
} else {
- ret = snprintf(pathname, PATH_MAX, "%s
/
%s", consumer->subdir,
+ ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir,
ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
ua_sess->path);
if (ret < 0) {
PERROR("snprintf channel path");
@@
-155,7
+155,10
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
consumer->net_seq_index,
ua_chan->key,
registry->uuid,
consumer->net_seq_index,
ua_chan->key,
registry->uuid,
- chan_id);
+ chan_id,
+ ua_chan->tracefile_size,
+ ua_chan->tracefile_count,
+ ua_sess->output_traces);
health_code_update();
health_code_update();
@@
-201,6
+204,12
@@
int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
assert(socket->fd >= 0);
assert(registry);
assert(socket->fd >= 0);
assert(registry);
+ if (!consumer->enabled) {
+ ret = -LTTNG_ERR_NO_CONSUMER;
+ DBG3("Consumer is disabled");
+ goto error;
+ }
+
pthread_mutex_lock(socket->lock);
ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
pthread_mutex_lock(socket->lock);
ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
This page took
0.025393 seconds
and
4
git commands to generate.