X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=8411ff96463aab27773eb85123b8bac4e6369415;hb=40dc48e0d6106d0ba7b96ef780c754b00ce82fd5;hp=be532b58789dea028d6919c38a97d3d8d1eedc4d;hpb=6d805429e9cb049eb0c9205fcf742a53e3166caf;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index be532b587..8411ff964 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -30,21 +30,6 @@
 #include <common/compat/fcntl.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 
-/*
- * When the receiving thread dies, we need to have a way to make the polling
- * thread exit eventually. If all FDs hang up (normal case when the
- * lttng-sessiond stops), we can exit cleanly, but if there is a problem and
- * for whatever reason some FDs remain open, the consumer should still exit
- * eventually.
- *
- * If the timeout is reached, it means that during this period no events
- * occurred on the FDs so we need to force an exit. This case should not happen
- * but it is a safety to ensure we won't block the consumer indefinitely.
- *
- * The value of 2 seconds is an arbitrary choice.
- */
-#define LTTNG_CONSUMER_POLL_TIMEOUT 2000
-
 /* Commands for consumer */
 enum lttng_consumer_command {
 	LTTNG_CONSUMER_ADD_CHANNEL,
@@ -308,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.
  */