From 40dc48e0d6106d0ba7b96ef780c754b00ce82fd5 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 3 Dec 2012 14:15:25 -0500 Subject: [PATCH 1/1] Fix: set the stream ht static in consumer file Signed-off-by: David Goulet --- src/common/consumer.c | 7 ++----- src/common/consumer.h | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/common/consumer.c b/src/common/consumer.c index 16b9eb64f..24b1f1d9f 100644 --- a/src/common/consumer.c +++ b/src/common/consumer.c @@ -56,15 +56,12 @@ struct lttng_consumer_global_data consumer_data = { volatile int consumer_quit; /* - * The following two hash tables are visible by all threads which are separated - * in different source files. - * * Global hash table containing respectively metadata and data streams. The * stream element in this ht should only be updated by the metadata poll thread * for the metadata and the data poll thread for the data. */ -struct lttng_ht *metadata_ht; -struct lttng_ht *data_ht; +static struct lttng_ht *metadata_ht; +static struct lttng_ht *data_ht; /* * Notify a thread pipe to poll back again. This usually means that some global diff --git a/src/common/consumer.h b/src/common/consumer.h index 2bcb0db24..8411ff964 100644 --- a/src/common/consumer.h +++ b/src/common/consumer.h @@ -293,10 +293,6 @@ struct lttng_consumer_global_data { struct lttng_ht *stream_list_ht; }; -/* Defined in consumer.c and coupled with explanations */ -extern struct lttng_ht *metadata_ht; -extern struct lttng_ht *data_ht; - /* * Init consumer data structures. */ -- 2.34.1