Fix: set the stream ht static in consumer file

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 16b9eb64f88ae006a742ade5d3d05b162d5bb0ef..24b1f1d9f04bea22eb79c77ebebc2b836bbcebca 100644 (file)
--- 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 2bcb0db24d88fed6419d21685023bf1dbe0ffccb..8411ff96463aab27773eb85123b8bac4e6369415 100644 (file)
--- 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.
  */