Fix: cmd_rotate_session() returns unexpected error codes

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

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 8369d149cf59d0902e31de83e99b7377ad792d01..a5dc0d300c51a790bd762d85307829bd50389a44 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -25,6 +25,7 @@
 
 #include "trace-ust.h"
 #include "ust-registry.h"
+#include "session.h"
 
 #define UST_APP_EVENT_LIST_SIZE 32
 
@@ -85,6 +86,8 @@ struct lttng_ht *ust_app_ht;
 /*
  * Global applications HT used by the session daemon. This table is indexed by
  * socket using the sock_n node and sock value of an ust_app.
+ *
+ * The 'sock' in question here is the 'command' socket.
  */
 struct lttng_ht *ust_app_ht_by_sock;
 
@@ -134,7 +137,11 @@ struct ust_app_channel {
        int handle;
        /* Channel and streams were sent to the UST tracer. */
        int is_sent;
-       /* Unique key used to identify the channel on the consumer side. */
+       /*
+        * Unique key used to identify the channel on the consumer side.
+        * 0 is a reserved 'invalid' value used to indicate that the consumer
+        * does not know about this channel (i.e. an error occured).
+        */
        uint64_t key;
        /* Id of the tracing channel set on creation. */
        uint64_t tracing_channel_id;
@@ -157,6 +164,7 @@ struct ust_app_channel {
        struct lttng_ht *events;
        uint64_t tracefile_size;
        uint64_t tracefile_count;
+       uint64_t monitor_timer_interval;
        /*
         * Node indexed by channel name in the channels' hash table of a session.
         */
@@ -328,7 +336,6 @@ void ust_app_global_update_all(struct ltt_ust_session *usess);
 void ust_app_clean_list(void);
 int ust_app_ht_alloc(void);
 struct ust_app *ust_app_find_by_pid(pid_t pid);
-int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate);
 struct ust_app_stream *ust_app_alloc_stream(void);
 int ust_app_recv_registration(int sock, struct ust_register_msg *msg);
 int ust_app_recv_notify(int sock);
@@ -353,6 +360,7 @@ int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess,
                struct consumer_output *consumer,
                int overwrite, uint64_t *discarded, uint64_t *lost);
 int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess);
+int ust_app_rotate_session(struct ltt_session *session);
 
 static inline
 int ust_app_supported(void)
@@ -497,11 +505,6 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess,
        return 0;
 }
 static inline
-int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
-{
-       return 0;
-}
-static inline
 int ust_app_recv_registration(int sock, struct ust_register_msg *msg)
 {
        return 0;
@@ -584,8 +587,15 @@ int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess,
 {
        return 0;
 }
+
+static inline
+int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess)
+{
+       return 0;
+}
+
 static inline
-int ust_app_regenerate_metadata_all(struct ltt_ust_session *usess)
+enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 {
        return 0;
 }