X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=01266a700cb37199966c9257eba335689e877453;hb=17e7527387f4c002b6e20d6b09444ce521f8117f;hp=52a4ed171d6b0dde5d1759c781f54ef45994cab0;hpb=fe4477ee14abb348ce9e167f8b4c09312d67de36;p=lttng-tools.git diff --git a/src/common/consumer.c b/src/common/consumer.c index 52a4ed171..01266a700 100644 --- a/src/common/consumer.c +++ b/src/common/consumer.c @@ -50,12 +50,14 @@ struct lttng_consumer_global_data consumer_data = { enum consumer_channel_action { CONSUMER_CHANNEL_ADD, + CONSUMER_CHANNEL_DEL, CONSUMER_CHANNEL_QUIT, }; struct consumer_channel_msg { enum consumer_channel_action action; - struct lttng_consumer_channel *chan; + struct lttng_consumer_channel *chan; /* add */ + uint64_t key; /* del */ }; /* @@ -91,6 +93,7 @@ static void notify_thread_pipe(int wpipe) static void notify_channel_pipe(struct lttng_consumer_local_data *ctx, struct lttng_consumer_channel *chan, + uint64_t key, enum consumer_channel_action action) { struct consumer_channel_msg msg; @@ -103,8 +106,15 @@ static void notify_channel_pipe(struct lttng_consumer_local_data *ctx, } while (ret < 0 && errno == EINTR); } +void notify_thread_del_channel(struct lttng_consumer_local_data *ctx, + uint64_t key) +{ + notify_channel_pipe(ctx, NULL, key, CONSUMER_CHANNEL_DEL); +} + static int read_channel_pipe(struct lttng_consumer_local_data *ctx, struct lttng_consumer_channel **chan, + uint64_t *key, enum consumer_channel_action *action) { struct consumer_channel_msg msg; @@ -116,6 +126,7 @@ static int read_channel_pipe(struct lttng_consumer_local_data *ctx, if (ret > 0) { *action = msg.action; *chan = msg.chan; + *key = msg.key; } return ret; } @@ -319,9 +330,9 @@ static void cleanup_relayd_ht(void) destroy_relayd(relayd); } - lttng_ht_destroy(consumer_data.relayd_ht); - rcu_read_unlock(); + + lttng_ht_destroy(consumer_data.relayd_ht); } /* @@ -516,8 +527,7 @@ void consumer_del_stream(struct lttng_consumer_stream *stream, } rcu_read_unlock(); - uatomic_dec(&stream->chan->refcount); - if (!uatomic_read(&stream->chan->refcount) + if (!uatomic_sub_return(&stream->chan->refcount, 1) && !uatomic_read(&stream->chan->nb_init_stream_left)) { free_chan = stream->chan; } @@ -659,6 +669,8 @@ static int add_stream(struct lttng_consumer_stream *stream, * stream. */ if (uatomic_read(&stream->chan->nb_init_stream_left) > 0) { + /* Increment refcount before decrementing nb_init_stream_left */ + cmm_smp_wmb(); uatomic_dec(&stream->chan->nb_init_stream_left); } @@ -719,6 +731,8 @@ struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair( obj->net_seq_idx = net_seq_idx; obj->refcount = 0; obj->destroy_flag = 0; + obj->control_sock.sock.fd = -1; + obj->data_sock.sock.fd = -1; lttng_ht_node_init_u64(&obj->node, obj->net_seq_idx); pthread_mutex_init(&obj->ctrl_sock_mutex, NULL); @@ -899,7 +913,7 @@ end: if (!ret && channel->wait_fd != -1 && channel->metadata_stream == NULL) { - notify_channel_pipe(ctx, channel, CONSUMER_CHANNEL_ADD); + notify_channel_pipe(ctx, channel, -1, CONSUMER_CHANNEL_ADD); } return ret; } @@ -1410,6 +1424,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap( goto end; } outfd = stream->out_fd = ret; + /* Reset current size because we just perform a rotation. */ + stream->tracefile_size_current = 0; } stream->tracefile_size_current += len; } @@ -1590,6 +1606,8 @@ ssize_t lttng_consumer_on_read_subbuffer_splice( goto end; } outfd = stream->out_fd = ret; + /* Reset current size because we just perform a rotation. */ + stream->tracefile_size_current = 0; } stream->tracefile_size_current += len; } @@ -1937,8 +1955,7 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream, rcu_read_unlock(); /* Atomically decrement channel refcount since other threads can use it. */ - uatomic_dec(&stream->chan->refcount); - if (!uatomic_read(&stream->chan->refcount) + if (!uatomic_sub_return(&stream->chan->refcount, 1) && !uatomic_read(&stream->chan->nb_init_stream_left)) { /* Go for channel deletion! */ free_chan = stream->chan; @@ -2008,6 +2025,8 @@ static int add_metadata_stream(struct lttng_consumer_stream *stream, * stream. */ if (uatomic_read(&stream->chan->nb_init_stream_left) > 0) { + /* Increment refcount before decrementing nb_init_stream_left */ + cmm_smp_wmb(); uatomic_dec(&stream->chan->nb_init_stream_left); } @@ -2557,6 +2576,13 @@ void consumer_close_channel_streams(struct lttng_consumer_channel *channel) ht->hash_fct(&channel->key, lttng_ht_seed), ht->match_fct, &channel->key, &iter.iter, stream, node_channel_id.node) { + /* + * Protect against teardown with mutex. + */ + pthread_mutex_lock(&stream->lock); + if (cds_lfht_is_node_deleted(&stream->node.node)) { + goto next; + } switch (consumer_data.type) { case LTTNG_CONSUMER_KERNEL: break; @@ -2573,6 +2599,8 @@ void consumer_close_channel_streams(struct lttng_consumer_channel *channel) ERR("Unknown consumer_data type"); assert(0); } + next: + pthread_mutex_unlock(&stream->lock); } rcu_read_unlock(); } @@ -2680,8 +2708,9 @@ restart: continue; } else if (revents & LPOLLIN) { enum consumer_channel_action action; + uint64_t key; - ret = read_channel_pipe(ctx, &chan, &action); + ret = read_channel_pipe(ctx, &chan, &key, &action); if (ret <= 0) { ERR("Error reading channel pipe"); continue; @@ -2700,6 +2729,27 @@ restart: lttng_poll_add(&events, chan->wait_fd, LPOLLIN | LPOLLPRI); break; + case CONSUMER_CHANNEL_DEL: + { + chan = consumer_find_channel(key); + if (!chan) { + ERR("UST consumer get channel key %" PRIu64 " not found for del channel", key); + break; + } + lttng_poll_del(&events, chan->wait_fd); + ret = lttng_ht_del(channel_ht, &iter); + assert(ret == 0); + consumer_close_channel_streams(chan); + + /* + * Release our own refcount. Force channel deletion even if + * streams were not initialized. + */ + if (!uatomic_sub_return(&chan->refcount, 1)) { + consumer_del_channel(chan); + } + goto restart; + } case CONSUMER_CHANNEL_QUIT: /* * Remove the pipe from the poll set and continue the loop @@ -2737,6 +2787,12 @@ restart: ret = lttng_ht_del(channel_ht, &iter); assert(ret == 0); consumer_close_channel_streams(chan); + + /* Release our own refcount */ + if (!uatomic_sub_return(&chan->refcount, 1) + && !uatomic_read(&chan->nb_init_stream_left)) { + consumer_del_channel(chan); + } } /* Release RCU lock for the channel looked up */ @@ -2914,7 +2970,7 @@ end: */ notify_thread_pipe(ctx->consumer_data_pipe[1]); - notify_channel_pipe(ctx, NULL, CONSUMER_CHANNEL_QUIT); + notify_channel_pipe(ctx, NULL, -1, CONSUMER_CHANNEL_QUIT); /* Cleaning up possibly open sockets. */ if (sock >= 0) { @@ -2999,7 +3055,7 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type, { int fd = -1, ret = -1, relayd_created = 0; enum lttng_error_code ret_code = LTTNG_OK; - struct consumer_relayd_sock_pair *relayd; + struct consumer_relayd_sock_pair *relayd = NULL; assert(ctx); assert(relayd_sock);