Copyright ownership transfer

[lttng-tools.git] / src / common / consumer / consumer.h

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 5fb812c08edb377f213f26b91e53dc74a2364d9a..4612fe81931923d0c02baed2e593c83186b30170 100644 (file)
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -396,6 +396,13 @@ typedef void (*lock_cb)(struct lttng_consumer_stream *);
  */
 typedef void (*unlock_cb)(struct lttng_consumer_stream *);
 
+/*
+ * Assert that the stream and channel lock and any other stream type specific
+ * lock that need to be acquired during the processing of a read_subbuffer
+ * operation is acquired.
+ */
+typedef void (*assert_locked_cb)(struct lttng_consumer_stream *);
+
 /*
  * Invoked when a subbuffer's metadata version does not match the last
  * known metadata version.
@@ -647,6 +654,7 @@ struct lttng_consumer_stream {
                send_live_beacon_cb send_live_beacon;
                on_sleep_cb on_sleep;
                unlock_cb unlock;
+               assert_locked_cb assert_locked;
        } read_subbuffer_ops;
        struct metadata_bucket *metadata_bucket;
 };
@@ -798,30 +806,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 +838,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 +863,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
@@ -1059,5 +1071,6 @@ int lttng_consumer_clear_channel(struct lttng_consumer_channel *channel);
 enum lttcomm_return_code lttng_consumer_open_channel_packets(
                struct lttng_consumer_channel *channel);
 int consumer_metadata_wakeup_pipe(const struct lttng_consumer_channel *channel);
+void lttng_consumer_sigbus_handle(void *addr);
 
 #endif /* LIB_CONSUMER_H */