Fix data pending for inflight streaming

[lttng-tools.git] / src / common / sessiond-comm / sessiond-comm.h

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 991cf7017eeb4c85e43c0f294e9e538387765158..3842558e5a4b99bd524d50bdec37937e64aa7f0b 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -53,44 +53,46 @@
 
 enum lttcomm_sessiond_command {
        /* Tracer command */
-       LTTNG_ADD_CONTEXT,
-       LTTNG_CALIBRATE,
-       LTTNG_DISABLE_CHANNEL,
-       LTTNG_DISABLE_EVENT,
-       LTTNG_DISABLE_ALL_EVENT,
-       LTTNG_ENABLE_CHANNEL,
-       LTTNG_ENABLE_EVENT,
-       LTTNG_ENABLE_ALL_EVENT,
+       LTTNG_ADD_CONTEXT                                       = 1,
+       LTTNG_CALIBRATE                                         = 2,
+       LTTNG_DISABLE_CHANNEL                           = 3,
+       LTTNG_DISABLE_EVENT                                     = 4,
+       LTTNG_DISABLE_ALL_EVENT                         = 5,
+       LTTNG_ENABLE_CHANNEL                            = 6,
+       LTTNG_ENABLE_EVENT                                      = 7,
+       LTTNG_ENABLE_ALL_EVENT                          = 8,
        /* Session daemon command */
-       LTTNG_CREATE_SESSION,
-       LTTNG_DESTROY_SESSION,
-       LTTNG_LIST_CHANNELS,
-       LTTNG_LIST_DOMAINS,
-       LTTNG_LIST_EVENTS,
-       LTTNG_LIST_SESSIONS,
-       LTTNG_LIST_TRACEPOINTS,
-       LTTNG_REGISTER_CONSUMER,
-       LTTNG_START_TRACE,
-       LTTNG_STOP_TRACE,
-       LTTNG_LIST_TRACEPOINT_FIELDS,
+       LTTNG_CREATE_SESSION                            = 9,
+       LTTNG_DESTROY_SESSION                           = 10,
+       LTTNG_LIST_CHANNELS                 = 11,
+       LTTNG_LIST_DOMAINS                  = 12,
+       LTTNG_LIST_EVENTS                   = 13,
+       LTTNG_LIST_SESSIONS                 = 14,
+       LTTNG_LIST_TRACEPOINTS              = 15,
+       LTTNG_REGISTER_CONSUMER             = 16,
+       LTTNG_START_TRACE                   = 17,
+       LTTNG_STOP_TRACE                    = 18,
+       LTTNG_LIST_TRACEPOINT_FIELDS        = 19,
 
        /* Consumer */
-       LTTNG_DISABLE_CONSUMER,
-       LTTNG_ENABLE_CONSUMER,
-       LTTNG_SET_CONSUMER_URI,
+       LTTNG_DISABLE_CONSUMER              = 20,
+       LTTNG_ENABLE_CONSUMER               = 21,
+       LTTNG_SET_CONSUMER_URI              = 22,
        /* Relay daemon */
-       RELAYD_ADD_STREAM,
-       RELAYD_CREATE_SESSION,
-       RELAYD_START_DATA,
-       RELAYD_UPDATE_SYNC_INFO,
-       RELAYD_VERSION,
-       RELAYD_SEND_METADATA,
-       RELAYD_CLOSE_STREAM,
-       RELAYD_DATA_PENDING,
-       RELAYD_QUIESCENT_CONTROL,
-       LTTNG_ENABLE_EVENT_WITH_FILTER,
-       LTTNG_HEALTH_CHECK,
-       LTTNG_DATA_PENDING,
+       RELAYD_ADD_STREAM                   = 23,
+       RELAYD_CREATE_SESSION               = 24,
+       RELAYD_START_DATA                   = 25,
+       RELAYD_UPDATE_SYNC_INFO             = 26,
+       RELAYD_VERSION                      = 27,
+       RELAYD_SEND_METADATA                = 28,
+       RELAYD_CLOSE_STREAM                 = 29,
+       RELAYD_DATA_PENDING                 = 30,
+       RELAYD_QUIESCENT_CONTROL            = 31,
+       LTTNG_ENABLE_EVENT_WITH_FILTER      = 32,
+       LTTNG_HEALTH_CHECK                  = 33,
+       LTTNG_DATA_PENDING                  = 34,
+       RELAYD_BEGIN_DATA_PENDING           = 35,
+       RELAYD_END_DATA_PENDING             = 36,
 };
 
 /*
@@ -214,10 +216,12 @@ struct lttcomm_session_msg {
  * bytecode. It is made of tuples: (uint16_t, var. len. string). It
  * starts at reloc_table_offset.
  */
+#define LTTNG_FILTER_PADDING   32
 struct lttng_filter_bytecode {
        uint32_t len;   /* len of data */
        uint32_t reloc_table_offset;
        uint64_t seqnum;
+       char padding[LTTNG_FILTER_PADDING];
        char data[0];
 };
 
@@ -279,6 +283,8 @@ struct lttcomm_consumer_msg {
                        enum lttng_stream_type type;
                        /* Open socket to the relayd */
                        struct lttcomm_sock sock;
+                       /* Tracing session id associated to the relayd. */
+                       uint64_t session_id;
                } relayd_sock;
                struct {
                        uint64_t net_seq_idx;
@@ -289,6 +295,13 @@ struct lttcomm_consumer_msg {
        } u;
 };
 
+/*
+ * Status message returned to the sessiond after a received command.
+ */
+struct lttcomm_consumer_status_msg {
+       enum lttng_error_code ret_code;
+};
+
 #ifdef HAVE_LIBLTTNG_UST_CTL
 
 #include <lttng/ust-abi.h>