From fa29bfbf73e837b936d80b4d5a1206dfb8496f07 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 31 Mar 2021 14:40:13 -0400 Subject: [PATCH] Clean-up: consumer: prepend `the_` to global variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This avoids name clashes between the global variable and local variables / function parameters. This is a step towards enabling -Wshadow. This also helps readability, in my opinion, as it helps quickly spot that some code is using a global variable. Signed-off-by: Simon Marchi Signed-off-by: Jérémie Galarneau Change-Id: I20eb47b91e3500bf1aebee17fdb995940cae7a33 --- src/common/consumer/consumer-metadata-cache.c | 2 +- src/common/consumer/consumer-stream.c | 22 +- src/common/consumer/consumer-timer.c | 12 +- src/common/consumer/consumer.c | 221 +++++++++--------- src/common/consumer/consumer.h | 2 +- src/common/kernel-consumer/kernel-consumer.c | 2 +- src/common/ust-consumer/ust-consumer.c | 26 +-- 7 files changed, 147 insertions(+), 140 deletions(-) diff --git a/src/common/consumer/consumer-metadata-cache.c b/src/common/consumer/consumer-metadata-cache.c index 976c83e54..1038b84e6 100644 --- a/src/common/consumer/consumer-metadata-cache.c +++ b/src/common/consumer/consumer-metadata-cache.c @@ -28,7 +28,7 @@ enum metadata_cache_update_version_status { METADATA_CACHE_UPDATE_STATUS_VERSION_NOT_UPDATED, }; -extern struct lttng_consumer_global_data consumer_data; +extern struct lttng_consumer_global_data the_consumer_data; /* * Reset the metadata cache. diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c index 1e3bfe785..d68077855 100644 --- a/src/common/consumer/consumer-stream.c +++ b/src/common/consumer/consumer-stream.c @@ -369,7 +369,7 @@ int consumer_stream_sync_metadata(struct lttng_consumer_local_data *ctx, assert(ctx); /* Ease our life a bit. */ - ht = consumer_data.stream_list_ht; + ht = the_consumer_data.stream_list_ht; rcu_read_lock(); @@ -817,7 +817,7 @@ void consumer_stream_close(struct lttng_consumer_stream *stream) assert(stream); - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: if (stream->mmap_base != NULL) { ret = munmap(stream->mmap_base, stream->mmap_len); @@ -925,19 +925,19 @@ void consumer_stream_delete(struct lttng_consumer_stream *stream, * that did not add the stream to a (all) hash table. Same goes for the * next call ht del call. */ - (void) lttng_ht_del(consumer_data.stream_per_chan_id_ht, &iter); + (void) lttng_ht_del(the_consumer_data.stream_per_chan_id_ht, &iter); /* Delete from the global stream list. */ iter.iter.node = &stream->node_session_id.node; /* See the previous ht del on why we ignore the returned value. */ - (void) lttng_ht_del(consumer_data.stream_list_ht, &iter); + (void) lttng_ht_del(the_consumer_data.stream_list_ht, &iter); rcu_read_unlock(); if (!stream->metadata_flag) { /* Decrement the stream count of the global consumer data. */ - assert(consumer_data.stream_count > 0); - consumer_data.stream_count--; + assert(the_consumer_data.stream_count > 0); + the_consumer_data.stream_count--; } } @@ -959,7 +959,7 @@ void consumer_stream_destroy_buffers(struct lttng_consumer_stream *stream) { assert(stream); - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: break; case LTTNG_CONSUMER32_UST: @@ -1031,7 +1031,7 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream, * stream thus being globally visible. */ if (stream->globally_visible) { - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); pthread_mutex_lock(&stream->chan->lock); pthread_mutex_lock(&stream->lock); /* Remove every reference of the stream in the consumer. */ @@ -1043,11 +1043,11 @@ void consumer_stream_destroy(struct lttng_consumer_stream *stream, free_chan = unref_channel(stream); /* Indicates that the consumer data state MUST be updated after this. */ - consumer_data.need_update = 1; + the_consumer_data.need_update = 1; pthread_mutex_unlock(&stream->lock); pthread_mutex_unlock(&stream->chan->lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); } else { /* * If the stream is not visible globally, this needs to be done @@ -1289,7 +1289,7 @@ int consumer_stream_flush_buffer(struct lttng_consumer_stream *stream, { int ret = 0; - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: if (producer_active) { ret = kernctl_buffer_flush(stream->wait_fd); diff --git a/src/common/consumer/consumer-timer.c b/src/common/consumer/consumer-timer.c index aba2bbb41..44fdc879f 100644 --- a/src/common/consumer/consumer-timer.c +++ b/src/common/consumer/consumer-timer.c @@ -68,7 +68,7 @@ static void setmask(sigset_t *mask) } } -static int channel_monitor_pipe = -1; +static int the_channel_monitor_pipe = -1; /* * Execute action on a timer switch. @@ -271,7 +271,7 @@ static void live_timer(struct lttng_consumer_local_data *ctx, struct lttng_consumer_channel *channel; struct lttng_consumer_stream *stream; struct lttng_ht_iter iter; - const struct lttng_ht *ht = consumer_data.stream_per_chan_id_ht; + const struct lttng_ht *ht = the_consumer_data.stream_per_chan_id_ht; const flush_index_cb flush_index = ctx->type == LTTNG_CONSUMER_KERNEL ? consumer_flush_kernel_index : @@ -570,7 +570,7 @@ int sample_channel_positions(struct lttng_consumer_channel *channel, struct lttng_consumer_stream *stream; bool empty_channel = true; uint64_t high = 0, low = UINT64_MAX; - struct lttng_ht *ht = consumer_data.stream_per_chan_id_ht; + struct lttng_ht *ht = the_consumer_data.stream_per_chan_id_ht; *_total_consumed = 0; @@ -657,7 +657,7 @@ void monitor_timer(struct lttng_consumer_channel *channel) return; } - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: sample = lttng_kconsumer_sample_snapshot_positions; get_consumed = lttng_kconsumer_get_consumed_snapshot; @@ -708,14 +708,14 @@ void monitor_timer(struct lttng_consumer_channel *channel) int consumer_timer_thread_get_channel_monitor_pipe(void) { - return uatomic_read(&channel_monitor_pipe); + return uatomic_read(&the_channel_monitor_pipe); } int consumer_timer_thread_set_channel_monitor_pipe(int fd) { int ret; - ret = uatomic_cmpxchg(&channel_monitor_pipe, -1, fd); + ret = uatomic_cmpxchg(&the_channel_monitor_pipe, -1, fd); if (ret != -1) { ret = -1; goto end; diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c index 27a01bd7a..26fc819f6 100644 --- a/src/common/consumer/consumer.c +++ b/src/common/consumer/consumer.c @@ -45,10 +45,10 @@ #include #include -struct lttng_consumer_global_data consumer_data = { - .stream_count = 0, - .need_update = 1, - .type = LTTNG_CONSUMER_UNKNOWN, +struct lttng_consumer_global_data the_consumer_data = { + .stream_count = 0, + .need_update = 1, + .type = LTTNG_CONSUMER_UNKNOWN, }; enum consumer_channel_action { @@ -84,7 +84,7 @@ static struct lttng_ht *data_ht; static const char *get_consumer_domain(void) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: return DEFAULT_KERNEL_TRACE_DIR; case LTTNG_CONSUMER64_UST: @@ -256,7 +256,7 @@ struct lttng_consumer_channel *consumer_find_channel(uint64_t key) return NULL; } - lttng_ht_lookup(consumer_data.channel_ht, &key, &iter); + lttng_ht_lookup(the_consumer_data.channel_ht, &key, &iter); node = lttng_ht_iter_get_node_u64(&iter); if (node != NULL) { channel = caa_container_of(node, struct lttng_consumer_channel, node); @@ -298,7 +298,7 @@ static void free_channel_rcu(struct rcu_head *head) struct lttng_consumer_channel *channel = caa_container_of(node, struct lttng_consumer_channel, node); - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: break; case LTTNG_CONSUMER32_UST: @@ -352,7 +352,7 @@ void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd) DBG("Consumer destroy and close relayd socket pair"); iter.iter.node = &relayd->node.node; - ret = lttng_ht_del(consumer_data.relayd_ht, &iter); + ret = lttng_ht_del(the_consumer_data.relayd_ht, &iter); if (ret != 0) { /* We assume the relayd is being or is destroyed */ return; @@ -372,7 +372,7 @@ void consumer_del_channel(struct lttng_consumer_channel *channel) DBG("Consumer delete channel key %" PRIu64, channel->key); - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); pthread_mutex_lock(&channel->lock); /* Destroy streams that might have been left in the stream list. */ @@ -385,7 +385,7 @@ void consumer_del_channel(struct lttng_consumer_channel *channel) consumer_timer_monitor_stop(channel); } - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: break; case LTTNG_CONSUMER32_UST: @@ -406,11 +406,11 @@ void consumer_del_channel(struct lttng_consumer_channel *channel) rcu_read_lock(); iter.iter.node = &channel->node.node; - ret = lttng_ht_del(consumer_data.channel_ht, &iter); + ret = lttng_ht_del(the_consumer_data.channel_ht, &iter); assert(!ret); iter.iter.node = &channel->channels_by_session_id_ht_node.node; - ret = lttng_ht_del(consumer_data.channels_by_session_id_ht, + ret = lttng_ht_del(the_consumer_data.channels_by_session_id_ht, &iter); assert(!ret); rcu_read_unlock(); @@ -420,7 +420,7 @@ void consumer_del_channel(struct lttng_consumer_channel *channel) call_rcu(&channel->node.head, free_channel_rcu); end: pthread_mutex_unlock(&channel->lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); } /* @@ -434,14 +434,14 @@ static void cleanup_relayd_ht(void) rcu_read_lock(); - cds_lfht_for_each_entry(consumer_data.relayd_ht->ht, &iter.iter, relayd, - node.node) { + cds_lfht_for_each_entry(the_consumer_data.relayd_ht->ht, &iter.iter, + relayd, node.node) { consumer_destroy_relayd(relayd); } rcu_read_unlock(); - lttng_ht_destroy(consumer_data.relayd_ht); + lttng_ht_destroy(the_consumer_data.relayd_ht); } /* @@ -581,7 +581,7 @@ void consumer_add_data_stream(struct lttng_consumer_stream *stream) DBG3("Adding consumer stream %" PRIu64, stream->key); - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); pthread_mutex_lock(&stream->chan->lock); pthread_mutex_lock(&stream->chan->timer_lock); pthread_mutex_lock(&stream->lock); @@ -592,7 +592,7 @@ void consumer_add_data_stream(struct lttng_consumer_stream *stream) lttng_ht_add_unique_u64(ht, &stream->node); - lttng_ht_add_u64(consumer_data.stream_per_chan_id_ht, + lttng_ht_add_u64(the_consumer_data.stream_per_chan_id_ht, &stream->node_channel_id); /* @@ -600,7 +600,8 @@ void consumer_add_data_stream(struct lttng_consumer_stream *stream) * the key since the HT does not use it and we allow to add redundant keys * into this table. */ - lttng_ht_add_u64(consumer_data.stream_list_ht, &stream->node_session_id); + lttng_ht_add_u64(the_consumer_data.stream_list_ht, + &stream->node_session_id); /* * When nb_init_stream_left reaches 0, we don't need to trigger any action @@ -616,14 +617,14 @@ void consumer_add_data_stream(struct lttng_consumer_stream *stream) } /* Update consumer data once the node is inserted. */ - consumer_data.stream_count++; - consumer_data.need_update = 1; + the_consumer_data.stream_count++; + the_consumer_data.need_update = 1; rcu_read_unlock(); pthread_mutex_unlock(&stream->lock); pthread_mutex_unlock(&stream->chan->timer_lock); pthread_mutex_unlock(&stream->chan->lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); } /* @@ -638,13 +639,13 @@ static int add_relayd(struct consumer_relayd_sock_pair *relayd) assert(relayd); - lttng_ht_lookup(consumer_data.relayd_ht, - &relayd->net_seq_idx, &iter); + lttng_ht_lookup(the_consumer_data.relayd_ht, &relayd->net_seq_idx, + &iter); node = lttng_ht_iter_get_node_u64(&iter); if (node != NULL) { goto end; } - lttng_ht_add_unique_u64(consumer_data.relayd_ht, &relayd->node); + lttng_ht_add_unique_u64(the_consumer_data.relayd_ht, &relayd->node); end: return ret; @@ -699,8 +700,7 @@ struct consumer_relayd_sock_pair *consumer_find_relayd(uint64_t key) goto error; } - lttng_ht_lookup(consumer_data.relayd_ht, &key, - &iter); + lttng_ht_lookup(the_consumer_data.relayd_ht, &key, &iter); node = lttng_ht_iter_get_node_u64(&iter); if (node != NULL) { relayd = caa_container_of(node, struct consumer_relayd_sock_pair, node); @@ -931,7 +931,7 @@ int consumer_metadata_stream_dump(struct lttng_consumer_stream *stream) assert(stream->metadata_flag); assert(stream->chan->trace_chunk); - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: /* * Reset the position of what has been read from the @@ -1021,7 +1021,7 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key, if (chunk_id) { trace_chunk = lttng_trace_chunk_registry_find_chunk( - consumer_data.chunk_registry, session_id, + the_consumer_data.chunk_registry, session_id, *chunk_id); if (!trace_chunk) { ERR("Failed to find trace chunk reference during creation of channel"); @@ -1124,7 +1124,7 @@ error: int consumer_add_channel(struct lttng_consumer_channel *channel, struct lttng_consumer_local_data *ctx) { - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); pthread_mutex_lock(&channel->lock); pthread_mutex_lock(&channel->timer_lock); @@ -1136,15 +1136,15 @@ int consumer_add_channel(struct lttng_consumer_channel *channel, steal_channel_key(channel->key); rcu_read_lock(); - lttng_ht_add_unique_u64(consumer_data.channel_ht, &channel->node); - lttng_ht_add_u64(consumer_data.channels_by_session_id_ht, + lttng_ht_add_unique_u64(the_consumer_data.channel_ht, &channel->node); + lttng_ht_add_u64(the_consumer_data.channels_by_session_id_ht, &channel->channels_by_session_id_ht_node); rcu_read_unlock(); channel->is_published = true; pthread_mutex_unlock(&channel->timer_lock); pthread_mutex_unlock(&channel->lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); if (channel->wait_fd != -1 && channel->type == CONSUMER_CHANNEL_TYPE_DATA) { notify_channel_pipe(ctx, channel, -1, CONSUMER_CHANNEL_ADD); @@ -1288,26 +1288,26 @@ void lttng_consumer_cleanup(void) rcu_read_lock(); - cds_lfht_for_each_entry(consumer_data.channel_ht->ht, &iter.iter, channel, - node.node) { + cds_lfht_for_each_entry(the_consumer_data.channel_ht->ht, &iter.iter, + channel, node.node) { consumer_del_channel(channel); } rcu_read_unlock(); - lttng_ht_destroy(consumer_data.channel_ht); - lttng_ht_destroy(consumer_data.channels_by_session_id_ht); + lttng_ht_destroy(the_consumer_data.channel_ht); + lttng_ht_destroy(the_consumer_data.channels_by_session_id_ht); cleanup_relayd_ht(); - lttng_ht_destroy(consumer_data.stream_per_chan_id_ht); + lttng_ht_destroy(the_consumer_data.stream_per_chan_id_ht); /* * This HT contains streams that are freed by either the metadata thread or * the data thread so we do *nothing* on the hash table and simply destroy * it. */ - lttng_ht_destroy(consumer_data.stream_list_ht); + lttng_ht_destroy(the_consumer_data.stream_list_ht); /* * Trace chunks in the registry may still exist if the session @@ -1322,7 +1322,7 @@ void lttng_consumer_cleanup(void) * to hit. */ trace_chunks_left = lttng_trace_chunk_registry_put_each_chunk( - consumer_data.chunk_registry); + the_consumer_data.chunk_registry); if (trace_chunks_left) { ERR("%u trace chunks are leaked by lttng-consumerd. " "This can be caused by an internal error of the session daemon.", @@ -1330,7 +1330,7 @@ void lttng_consumer_cleanup(void) } /* Run all callbacks freeing each chunk. */ rcu_barrier(); - lttng_trace_chunk_registry_destroy(consumer_data.chunk_registry); + lttng_trace_chunk_registry_destroy(the_consumer_data.chunk_registry); } /* @@ -1421,9 +1421,9 @@ struct lttng_consumer_local_data *lttng_consumer_create( int ret; struct lttng_consumer_local_data *ctx; - assert(consumer_data.type == LTTNG_CONSUMER_UNKNOWN || - consumer_data.type == type); - consumer_data.type = type; + assert(the_consumer_data.type == LTTNG_CONSUMER_UNKNOWN || + the_consumer_data.type == type); + the_consumer_data.type = type; ctx = zmalloc(sizeof(struct lttng_consumer_local_data)); if (ctx == NULL) { @@ -1802,7 +1802,7 @@ ssize_t lttng_consumer_on_read_subbuffer_splice( int *splice_pipe; unsigned int relayd_hang_up = 0; - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: break; case LTTNG_CONSUMER32_UST: @@ -2006,7 +2006,7 @@ end: */ int lttng_consumer_sample_snapshot_positions(struct lttng_consumer_stream *stream) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: return lttng_kconsumer_sample_snapshot_positions(stream); case LTTNG_CONSUMER32_UST: @@ -2025,7 +2025,7 @@ int lttng_consumer_sample_snapshot_positions(struct lttng_consumer_stream *strea */ int lttng_consumer_take_snapshot(struct lttng_consumer_stream *stream) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: return lttng_kconsumer_take_snapshot(stream); case LTTNG_CONSUMER32_UST: @@ -2046,7 +2046,7 @@ int lttng_consumer_take_snapshot(struct lttng_consumer_stream *stream) int lttng_consumer_get_produced_snapshot(struct lttng_consumer_stream *stream, unsigned long *pos) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: return lttng_kconsumer_get_produced_snapshot(stream, pos); case LTTNG_CONSUMER32_UST: @@ -2067,7 +2067,7 @@ int lttng_consumer_get_produced_snapshot(struct lttng_consumer_stream *stream, int lttng_consumer_get_consumed_snapshot(struct lttng_consumer_stream *stream, unsigned long *pos) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: return lttng_kconsumer_get_consumed_snapshot(stream, pos); case LTTNG_CONSUMER32_UST: @@ -2083,7 +2083,7 @@ int lttng_consumer_get_consumed_snapshot(struct lttng_consumer_stream *stream, int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx, int sock, struct pollfd *consumer_sockpoll) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: return lttng_kconsumer_recv_cmd(ctx, sock, consumer_sockpoll); case LTTNG_CONSUMER32_UST: @@ -2099,7 +2099,7 @@ int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx, static void lttng_consumer_close_all_metadata(void) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: /* * The Kernel consumer has a different metadata scheme so we don't @@ -2141,7 +2141,7 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream, DBG3("Consumer delete metadata stream %d", stream->wait_fd); - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); /* * Note that this assumes that a stream's channel is never changed and * that the stream's lock doesn't need to be taken to sample its @@ -2183,7 +2183,7 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream, } pthread_mutex_unlock(&stream->lock); pthread_mutex_unlock(&channel->lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); if (free_channel) { consumer_del_channel(channel); @@ -2209,7 +2209,7 @@ void consumer_add_metadata_stream(struct lttng_consumer_stream *stream) DBG3("Adding metadata stream %" PRIu64 " to hash table", stream->key); - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); pthread_mutex_lock(&stream->chan->lock); pthread_mutex_lock(&stream->chan->timer_lock); pthread_mutex_lock(&stream->lock); @@ -2244,22 +2244,23 @@ void consumer_add_metadata_stream(struct lttng_consumer_stream *stream) lttng_ht_add_unique_u64(ht, &stream->node); - lttng_ht_add_u64(consumer_data.stream_per_chan_id_ht, - &stream->node_channel_id); + lttng_ht_add_u64(the_consumer_data.stream_per_chan_id_ht, + &stream->node_channel_id); /* * Add stream to the stream_list_ht of the consumer data. No need to steal * the key since the HT does not use it and we allow to add redundant keys * into this table. */ - lttng_ht_add_u64(consumer_data.stream_list_ht, &stream->node_session_id); + lttng_ht_add_u64(the_consumer_data.stream_list_ht, + &stream->node_session_id); rcu_read_unlock(); pthread_mutex_unlock(&stream->lock); pthread_mutex_unlock(&stream->chan->lock); pthread_mutex_unlock(&stream->chan->timer_lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); } /* @@ -2477,9 +2478,10 @@ restart: } } else if (revents & (LPOLLERR | LPOLLHUP)) { DBG("Metadata fd %d is hup|err.", pollfd); - if (!stream->hangup_flush_done - && (consumer_data.type == LTTNG_CONSUMER32_UST - || consumer_data.type == LTTNG_CONSUMER64_UST)) { + if (!stream->hangup_flush_done && + (the_consumer_data.type == LTTNG_CONSUMER32_UST || + the_consumer_data.type == + LTTNG_CONSUMER64_UST)) { DBG("Attempting to flush and consume the UST buffers"); lttng_ustconsumer_on_stream_hangup(stream); @@ -2575,8 +2577,8 @@ void *consumer_thread_data_poll(void *data) * the fds set has been updated, we need to update our * local array as well */ - pthread_mutex_lock(&consumer_data.lock); - if (consumer_data.need_update) { + pthread_mutex_lock(&the_consumer_data.lock); + if (the_consumer_data.need_update) { free(pollfd); pollfd = NULL; @@ -2584,18 +2586,21 @@ void *consumer_thread_data_poll(void *data) local_stream = NULL; /* Allocate for all fds */ - pollfd = zmalloc((consumer_data.stream_count + nb_pipes_fd) * sizeof(struct pollfd)); + pollfd = zmalloc((the_consumer_data.stream_count + + nb_pipes_fd) * + sizeof(struct pollfd)); if (pollfd == NULL) { PERROR("pollfd malloc"); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); goto end; } - local_stream = zmalloc((consumer_data.stream_count + nb_pipes_fd) * + local_stream = zmalloc((the_consumer_data.stream_count + + nb_pipes_fd) * sizeof(struct lttng_consumer_stream *)); if (local_stream == NULL) { PERROR("local_stream malloc"); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); goto end; } ret = update_poll_array(ctx, &pollfd, local_stream, @@ -2603,13 +2608,13 @@ void *consumer_thread_data_poll(void *data) if (ret < 0) { ERR("Error in allocating pollfd or local_outfds"); lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_POLL_ERROR); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); goto end; } nb_fd = ret; - consumer_data.need_update = 0; + the_consumer_data.need_update = 0; } - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); /* No FDs and consumer_quit, consumer_cleanup the thread */ if (nb_fd == 0 && nb_inactive_fd == 0 && @@ -2755,8 +2760,8 @@ void *consumer_thread_data_poll(void *data) } if (!local_stream[i]->hangup_flush_done && (pollfd[i].revents & (POLLHUP | POLLERR | POLLNVAL)) - && (consumer_data.type == LTTNG_CONSUMER32_UST - || consumer_data.type == LTTNG_CONSUMER64_UST)) { + && (the_consumer_data.type == LTTNG_CONSUMER32_UST + || the_consumer_data.type == LTTNG_CONSUMER64_UST)) { DBG("fd %d is hup|err|nval. Attempting flush and read.", pollfd[i].fd); lttng_ustconsumer_on_stream_hangup(local_stream[i]); @@ -2835,7 +2840,7 @@ void consumer_close_channel_streams(struct lttng_consumer_channel *channel) struct lttng_consumer_stream *stream; struct lttng_ht_iter iter; - ht = consumer_data.stream_per_chan_id_ht; + ht = the_consumer_data.stream_per_chan_id_ht; rcu_read_lock(); cds_lfht_for_each_entry_duplicate(ht->ht, @@ -2849,7 +2854,7 @@ void consumer_close_channel_streams(struct lttng_consumer_channel *channel) if (cds_lfht_is_node_deleted(&stream->node.node)) { goto next; } - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: break; case LTTNG_CONSUMER32_UST: @@ -3029,7 +3034,7 @@ restart: ret = lttng_ht_del(channel_ht, &iter); assert(ret == 0); - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: break; case LTTNG_CONSUMER32_UST: @@ -3477,7 +3482,7 @@ error_put_subbuf: int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream) { - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: return lttng_kconsumer_on_recv_stream(stream); case LTTNG_CONSUMER32_UST: @@ -3495,29 +3500,30 @@ int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream) */ int lttng_consumer_init(void) { - consumer_data.channel_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); - if (!consumer_data.channel_ht) { + the_consumer_data.channel_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); + if (!the_consumer_data.channel_ht) { goto error; } - consumer_data.channels_by_session_id_ht = + the_consumer_data.channels_by_session_id_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); - if (!consumer_data.channels_by_session_id_ht) { + if (!the_consumer_data.channels_by_session_id_ht) { goto error; } - consumer_data.relayd_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); - if (!consumer_data.relayd_ht) { + the_consumer_data.relayd_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); + if (!the_consumer_data.relayd_ht) { goto error; } - consumer_data.stream_list_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); - if (!consumer_data.stream_list_ht) { + the_consumer_data.stream_list_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); + if (!the_consumer_data.stream_list_ht) { goto error; } - consumer_data.stream_per_chan_id_ht = lttng_ht_new(0, LTTNG_HT_TYPE_U64); - if (!consumer_data.stream_per_chan_id_ht) { + the_consumer_data.stream_per_chan_id_ht = + lttng_ht_new(0, LTTNG_HT_TYPE_U64); + if (!the_consumer_data.stream_per_chan_id_ht) { goto error; } @@ -3531,8 +3537,8 @@ int lttng_consumer_init(void) goto error; } - consumer_data.chunk_registry = lttng_trace_chunk_registry_create(); - if (!consumer_data.chunk_registry) { + the_consumer_data.chunk_registry = lttng_trace_chunk_registry_create(); + if (!the_consumer_data.chunk_registry) { goto error; } @@ -3740,8 +3746,8 @@ static struct consumer_relayd_sock_pair *find_relayd_by_session_id(uint64_t id) struct consumer_relayd_sock_pair *relayd = NULL; /* Iterate over all relayd since they are indexed by net_seq_idx. */ - cds_lfht_for_each_entry(consumer_data.relayd_ht->ht, &iter.iter, relayd, - node.node) { + cds_lfht_for_each_entry(the_consumer_data.relayd_ht->ht, &iter.iter, + relayd, node.node) { /* * Check by sessiond id which is unique here where the relayd session * id might not be when having multiple relayd. @@ -3776,9 +3782,9 @@ int consumer_data_pending(uint64_t id) DBG("Consumer data pending command on session id %" PRIu64, id); rcu_read_lock(); - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: data_pending = lttng_kconsumer_data_pending; break; @@ -3792,7 +3798,7 @@ int consumer_data_pending(uint64_t id) } /* Ease our life a bit */ - ht = consumer_data.stream_list_ht; + ht = the_consumer_data.stream_list_ht; cds_lfht_for_each_entry_duplicate(ht->ht, ht->hash_fct(&id, lttng_ht_seed), @@ -3879,13 +3885,13 @@ int consumer_data_pending(uint64_t id) data_not_pending: /* Data is available to be read by a viewer. */ - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); rcu_read_unlock(); return 0; data_pending: /* Data is still being extracted from buffers. */ - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); rcu_read_unlock(); return 1; } @@ -3992,7 +3998,7 @@ int lttng_consumer_rotate_channel(struct lttng_consumer_channel *channel, int ret; struct lttng_consumer_stream *stream; struct lttng_ht_iter iter; - struct lttng_ht *ht = consumer_data.stream_per_chan_id_ht; + struct lttng_ht *ht = the_consumer_data.stream_per_chan_id_ht; struct lttng_dynamic_array stream_rotation_positions; uint64_t next_chunk_id, stream_count = 0; enum lttng_trace_chunk_status chunk_status; @@ -4376,7 +4382,7 @@ int consumer_clear_buffer(struct lttng_consumer_stream *stream) goto end; } - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER_KERNEL: ret = kernctl_buffer_clear(stream->wait_fd); if (ret < 0) { @@ -4656,7 +4662,7 @@ int lttng_consumer_rotate_ready_streams(struct lttng_consumer_channel *channel, int ret; struct lttng_consumer_stream *stream; struct lttng_ht_iter iter; - struct lttng_ht *ht = consumer_data.stream_per_chan_id_ht; + struct lttng_ht *ht = the_consumer_data.stream_per_chan_id_ht; rcu_read_lock(); @@ -4814,7 +4820,7 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk( } published_chunk = lttng_trace_chunk_registry_publish_chunk( - consumer_data.chunk_registry, session_id, + the_consumer_data.chunk_registry, session_id, created_chunk); lttng_trace_chunk_put(created_chunk); created_chunk = NULL; @@ -4825,10 +4831,11 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk( } rcu_read_lock(); - cds_lfht_for_each_entry_duplicate(consumer_data.channels_by_session_id_ht->ht, - consumer_data.channels_by_session_id_ht->hash_fct( + cds_lfht_for_each_entry_duplicate( + the_consumer_data.channels_by_session_id_ht->ht, + the_consumer_data.channels_by_session_id_ht->hash_fct( &session_id, lttng_ht_seed), - consumer_data.channels_by_session_id_ht->match_fct, + the_consumer_data.channels_by_session_id_ht->match_fct, &session_id, &iter.iter, channel, channels_by_session_id_ht_node.node) { ret = lttng_consumer_channel_set_trace_chunk(channel, @@ -4941,7 +4948,7 @@ enum lttcomm_return_code lttng_consumer_close_trace_chunk( close_command_name); chunk = lttng_trace_chunk_registry_find_chunk( - consumer_data.chunk_registry, session_id, chunk_id); + the_consumer_data.chunk_registry, session_id, chunk_id); if (!chunk) { ERR("Failed to find chunk: session_id = %" PRIu64 ", chunk_id = %" PRIu64, @@ -4972,7 +4979,7 @@ enum lttcomm_return_code lttng_consumer_close_trace_chunk( * current chunk found in the session's channels. */ rcu_read_lock(); - cds_lfht_for_each_entry(consumer_data.channel_ht->ht, &iter.iter, + cds_lfht_for_each_entry(the_consumer_data.channel_ht->ht, &iter.iter, channel, node.node) { int ret; @@ -5057,8 +5064,8 @@ enum lttcomm_return_code lttng_consumer_trace_chunk_exists( ", chunk_id = %" PRIu64, relayd_id_str, chunk_id); ret = lttng_trace_chunk_registry_chunk_exists( - consumer_data.chunk_registry, session_id, - chunk_id, &chunk_exists_local); + the_consumer_data.chunk_registry, session_id, chunk_id, + &chunk_exists_local); if (ret) { /* Internal error. */ ERR("Failed to query the existence of a trace chunk"); @@ -5113,7 +5120,7 @@ int consumer_clear_monitored_channel(struct lttng_consumer_channel *channel) struct lttng_ht_iter iter; int ret; - ht = consumer_data.stream_per_chan_id_ht; + ht = the_consumer_data.stream_per_chan_id_ht; rcu_read_lock(); cds_lfht_for_each_entry_duplicate(ht->ht, diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h index 7b381b2c7..5064362c8 100644 --- a/src/common/consumer/consumer.h +++ b/src/common/consumer/consumer.h @@ -96,7 +96,7 @@ enum sync_metadata_status { SYNC_METADATA_STATUS_ERROR, }; -extern struct lttng_consumer_global_data consumer_data; +extern struct lttng_consumer_global_data the_consumer_data; struct stream_list { struct cds_list_head head; diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c index ecacadfd5..4ace64920 100644 --- a/src/common/kernel-consumer/kernel-consumer.c +++ b/src/common/kernel-consumer/kernel-consumer.c @@ -41,7 +41,7 @@ #include "kernel-consumer.h" -extern struct lttng_consumer_global_data consumer_data; +extern struct lttng_consumer_global_data the_consumer_data; extern int consumer_poll_timeout; /* diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c index 01c73f959..c4ee7446d 100644 --- a/src/common/ust-consumer/ust-consumer.c +++ b/src/common/ust-consumer/ust-consumer.c @@ -44,7 +44,7 @@ #define INT_MAX_STR_LEN 12 /* includes \0 */ -extern struct lttng_consumer_global_data consumer_data; +extern struct lttng_consumer_global_data the_consumer_data; extern int consumer_poll_timeout; /* @@ -708,7 +708,7 @@ static int flush_channel(uint64_t chan_key) goto error; } - ht = consumer_data.stream_per_chan_id_ht; + ht = the_consumer_data.stream_per_chan_id_ht; /* For each stream of the channel id, flush it. */ cds_lfht_for_each_entry_duplicate(ht->ht, @@ -762,7 +762,7 @@ static int clear_quiescent_channel(uint64_t chan_key) goto error; } - ht = consumer_data.stream_per_chan_id_ht; + ht = the_consumer_data.stream_per_chan_id_ht; /* For each stream of the channel id, clear quiescent state. */ cds_lfht_for_each_entry_duplicate(ht->ht, @@ -806,7 +806,7 @@ static int close_metadata(uint64_t chan_key) goto error; } - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); pthread_mutex_lock(&channel->lock); channel_monitor = channel->monitor; if (cds_lfht_is_node_deleted(&channel->node.node)) { @@ -815,7 +815,7 @@ static int close_metadata(uint64_t chan_key) lttng_ustconsumer_close_metadata(channel); pthread_mutex_unlock(&channel->lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); /* * The ownership of a metadata channel depends on the type of @@ -852,7 +852,7 @@ static int close_metadata(uint64_t chan_key) return ret; error_unlock: pthread_mutex_unlock(&channel->lock); - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); error: return ret; } @@ -1875,9 +1875,9 @@ error_push_metadata_fatal: DBG("UST consumer discarded events command for session id %" PRIu64, id); rcu_read_lock(); - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); - ht = consumer_data.stream_list_ht; + ht = the_consumer_data.stream_list_ht; /* * We only need a reference to the channel, but they are not @@ -1896,7 +1896,7 @@ error_push_metadata_fatal: break; } } - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); rcu_read_unlock(); DBG("UST consumer discarded events command for session id %" @@ -1926,9 +1926,9 @@ error_push_metadata_fatal: DBG("UST consumer lost packets command for session id %" PRIu64, id); rcu_read_lock(); - pthread_mutex_lock(&consumer_data.lock); + pthread_mutex_lock(&the_consumer_data.lock); - ht = consumer_data.stream_list_ht; + ht = the_consumer_data.stream_list_ht; /* * We only need a reference to the channel, but they are not @@ -1946,7 +1946,7 @@ error_push_metadata_fatal: break; } } - pthread_mutex_unlock(&consumer_data.lock); + pthread_mutex_unlock(&the_consumer_data.lock); rcu_read_unlock(); DBG("UST consumer lost packets command for session id %" @@ -3260,7 +3260,7 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx, memset(&request, 0, sizeof(request)); /* send the metadata request to sessiond */ - switch (consumer_data.type) { + switch (the_consumer_data.type) { case LTTNG_CONSUMER64_UST: request.bits_per_long = 64; break; -- 2.34.1