Launch the consumer management thread using lttng_thread

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.h

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index e9c7e31e31990eafde155956fb6a0f726cf95506..0e7ed0017a5a9d42f2b15b5ff5c8c074ba3051d9 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -66,26 +66,6 @@ struct consumer_socket {
 struct consumer_data {
        enum lttng_consumer_type type;
 
-       pthread_t thread;       /* Worker thread interacting with the consumer */
-
-       /* Conditions used by the consumer thread to indicate readiness. */
-       pthread_cond_t cond;
-       pthread_condattr_t condattr;
-       pthread_mutex_t cond_mutex;
-
-       /*
-        * This is a flag condition indicating that the consumer thread is ready
-        * and connected to the lttng-consumerd daemon. This flag MUST only be
-        * updated by locking the condition mutex above or before spawning a
-        * consumer thread.
-        *
-        * A value of 0 means that the thread is NOT ready. A value of 1 means that
-        * the thread consumer did connect successfully to the lttng-consumerd
-        * daemon. A negative value indicates that there is been an error and the
-        * thread has likely quit.
-        */
-       int consumer_thread_is_ready;
-
        /* Mutex to control consumerd pid assignation */
        pthread_mutex_t pid_mutex;
        pid_t pid;
@@ -312,8 +292,8 @@ int consumer_get_lost_packets(uint64_t session_id, uint64_t channel_key,
                struct consumer_output *consumer, uint64_t *lost);
 
 /* Snapshot command. */
-int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
-               struct snapshot_output *output, int metadata,
+enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
+               uint64_t key, struct snapshot_output *output, int metadata,
                uid_t uid, gid_t gid, const char *session_path, int wait,
                uint64_t nb_packets_per_stream, uint64_t trace_archive_id);