Merge branch 'master' of git://git.lttng.org/lttng-tools

[lttng-tools.git] / include / lttng / lttng-consumer.h

diff --git a/include/lttng/lttng-consumer.h b/include/lttng/lttng-consumer.h
index bba72ee69ec39f82a4b56cf69c65e84c7939b4ab..3d16d49732f9175a68ecff669e0ace402d55b2c2 100644 (file)
--- a/include/lttng/lttng-consumer.h
+++ b/include/lttng/lttng-consumer.h
@@ -78,7 +78,6 @@ struct lttng_consumer_channel {
        size_t mmap_len;
        struct lttng_ust_shm_handle *handle;
        int nr_streams;
-       int shm_fd_is_copy;
        int wait_fd_is_copy;
        int cpucount;
 };
@@ -184,9 +183,10 @@ struct lttng_consumer_global_data {
        /*
         * At this time, this lock is used to ensure coherence between the count
         * and number of element in the hash table. It's also a protection for
-        * concurrent read/write between threads. Although hash table used are
-        * lockless data structure, appropriate RCU lock mechanism are not yet
-        * implemented in the consumer.
+        * concurrent read/write between threads.
+        *
+        * XXX: We need to see if this lock is still needed with the lockless RCU
+        * hash tables.
         */
        pthread_mutex_t lock;