X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=582385c82bef2454361f39b6dca0d70b294157d7;hb=97535efaa975ca52bf02c2d5e76351bfd2e3defa;hp=0c83baa8cec451fce5671c1bc51e0c2cd3970e5e;hpb=881fc67f7002469477a5ad00e67a8077db6c0514;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 0c83baa8c..582385c82 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -29,6 +29,10 @@
 #include <common/buffer-view.h>
 #include <common/dynamic-array.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct lttng_consumer_local_data;
 
 /* Commands for consumer */
@@ -798,30 +802,30 @@ struct lttng_consumer_global_data {
 	 * This is nested OUTSIDE the stream lock.
 	 * This is nested OUTSIDE the consumer_relayd_sock_pair lock.
 	 */
-	pthread_mutex_t lock;
+	pthread_mutex_t lock {};
 
 	/*
 	 * Number of streams in the data stream hash table declared outside.
 	 * Protected by consumer_data.lock.
 	 */
-	int stream_count;
+	int stream_count = 0;
 
 	/* Channel hash table protected by consumer_data.lock. */
-	struct lttng_ht *channel_ht;
+	struct lttng_ht *channel_ht = nullptr;
 	/* Channel hash table indexed by session id. */
-	struct lttng_ht *channels_by_session_id_ht;
+	struct lttng_ht *channels_by_session_id_ht = nullptr;
 	/*
 	 * Flag specifying if the local array of FDs needs update in the
 	 * poll function. Protected by consumer_data.lock.
 	 */
-	unsigned int need_update;
-	enum lttng_consumer_type type;
+	unsigned int need_update = 1;
+	enum lttng_consumer_type type = LTTNG_CONSUMER_UNKNOWN;
 
 	/*
 	 * Relayd socket(s) hashtable indexed by network sequence number. Each
 	 * stream has an index which associate the right relayd socket to use.
 	 */
-	struct lttng_ht *relayd_ht;
+	struct lttng_ht *relayd_ht = nullptr;
 
 	/*
 	 * This hash table contains all streams (metadata and data) indexed by
@@ -830,17 +834,17 @@ struct lttng_consumer_global_data {
 	 *
 	 * This HT uses the "node_session_id" of the consumer stream.
 	 */
-	struct lttng_ht *stream_list_ht;
+	struct lttng_ht *stream_list_ht = nullptr;
 
 	/*
 	 * This HT uses the "node_channel_id" of the consumer stream.
 	 */
-	struct lttng_ht *stream_per_chan_id_ht;
+	struct lttng_ht *stream_per_chan_id_ht = nullptr;
 
 	/*
 	 * Trace chunk registry indexed by (session_id, chunk_id).
 	 */
-	struct lttng_trace_chunk_registry *chunk_registry;
+	struct lttng_trace_chunk_registry *chunk_registry = nullptr;
 };
 
 /*
@@ -855,8 +859,12 @@ extern int consumer_quit;
  */
 extern int consumer_quit;
 
-/* Flag used to temporarily pause data consumption from testpoints. */
-extern int data_consumption_paused;
+/*
+ * Flag used to temporarily pause data consumption from testpoints.
+ *
+ * This variable is dlsym-ed from a test, so needs to be exported.
+ */
+LTTNG_EXPORT extern int data_consumption_paused;
 
 /* Return a human-readable consumer type string that is suitable for logging. */
 static inline
@@ -1061,4 +1069,8 @@ enum lttcomm_return_code lttng_consumer_open_channel_packets(
 int consumer_metadata_wakeup_pipe(const struct lttng_consumer_channel *channel);
 void lttng_consumer_sigbus_handle(void *addr);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* LIB_CONSUMER_H */