Fix: consumer should await for initial streams

[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 32ce38430af115fbf4303249eaa2684c52654ae3..6d796efe42e650b20683c58e74be725db4716ba0 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -208,7 +208,7 @@ struct lttcomm_session_msg {
        } u;
 };
 
-#define LTTNG_FILTER_MAX_LEN   65336
+#define LTTNG_FILTER_MAX_LEN   65536
 
 /*
  * Filter bytecode data. The reloc table is located at the end of the
@@ -216,8 +216,8 @@ struct lttcomm_session_msg {
  * starts at reloc_table_offset.
  */
 struct lttng_filter_bytecode {
-       uint16_t len;   /* len of data */
-       uint16_t reloc_table_offset;
+       uint32_t len;   /* len of data */
+       uint32_t reloc_table_offset;
        char data[0];
 };
 
@@ -255,6 +255,8 @@ struct lttcomm_consumer_msg {
                        uint64_t max_sb_size; /* the subbuffer size for this channel */
                        /* shm_fd and wait_fd are sent as ancillary data */
                        uint64_t mmap_len;
+                       /* nb_init_streams is the number of streams open initially. */
+                       unsigned int nb_init_streams;
                        char name[LTTNG_SYMBOL_NAME_LEN];
                } channel;
                struct {