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 cdc48b7f3131df6600af05bf3c31cd70a5046266..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;
@@ -98,11 +78,6 @@ struct consumer_data {
         * consumer.
         */
        int channel_monitor_pipe;
-       /*
-        * Write-end of the channel rotation pipe to be passed to the
-        * consumer.
-        */
-       int channel_rotate_pipe;
        /*
         * The metadata socket object is handled differently and only created
         * locally in this object thus it's the only reference available in the
@@ -237,8 +212,6 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
                char *session_name, char *hostname, int session_live_timer);
 int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock,
                int pipe);
-int consumer_send_channel_rotate_pipe(struct consumer_socket *consumer_sock,
-               int pipe);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
                struct consumer_output *consumer);
 int consumer_recv_status_reply(struct consumer_socket *sock);
@@ -319,20 +292,22 @@ 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);
 
+/* Rotation commands. */
 int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
                uid_t uid, gid_t gid, struct consumer_output *output,
-               char *domain_path, bool is_metadata_channel, uint64_t new_chunk_id,
-               bool *rotate_pending_relay);
+               char *domain_path, bool is_metadata_channel, uint64_t new_chunk_id);
 int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
                const struct consumer_output *output, const char *old_path,
                const char *new_path, uid_t uid, gid_t gid);
-int consumer_rotate_pending_relay(struct consumer_socket *socket,
-               struct consumer_output *output, uint64_t session_id,
+int consumer_check_rotation_pending_local(struct consumer_socket *socket,
+               uint64_t session_id, uint64_t chunk_id);
+int consumer_check_rotation_pending_relay(struct consumer_socket *socket,
+               const struct consumer_output *output, uint64_t session_id,
                uint64_t chunk_id);
 int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id,
                const struct consumer_output *output, const char *path,