Add LTTNG_PACKED macro

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

diff --git a/src/common/sessiond-comm/relayd.h b/src/common/sessiond-comm/relayd.h
index b897714d719ea1e618af6f9b2695c46d301007da..03460de38566cdb7ec42b13a6c0e4d2a55f44f1d 100644 (file)
--- a/src/common/sessiond-comm/relayd.h
+++ b/src/common/sessiond-comm/relayd.h
@@ -25,6 +25,7 @@
 #include <stdint.h>
 
 #include <lttng/lttng.h>
+#include <common/defaults.h>
 
 #define RELAYD_VERSION_COMM_MAJOR             2
 #define RELAYD_VERSION_COMM_MINOR             1
@@ -38,7 +39,7 @@ struct lttcomm_relayd_hdr {
        uint64_t data_size;             /* data size following this header */
        uint32_t cmd;                   /* enum lttcomm_sessiond_command */
        uint32_t cmd_version;   /* command version */
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * lttng-relayd data header.
@@ -50,15 +51,23 @@ struct lttcomm_relayd_data_hdr {
        uint64_t net_seq_num;   /* Network sequence number, per stream. */
        uint32_t data_size;     /* data size following this header */
        uint32_t padding_size;  /* Size of 0 padding the data */
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
+
+/*
+ * Reply from a create session command.
+ */
+struct lttcomm_relayd_status_session {
+       uint64_t session_id;
+       uint32_t ret_code;
+} LTTNG_PACKED;
 
 /*
  * Used to add a stream on the relay daemon.
  */
 struct lttcomm_relayd_add_stream {
-       char channel_name[LTTNG_SYMBOL_NAME_LEN];
+       char channel_name[DEFAULT_STREAM_NAME_LEN];
        char pathname[PATH_MAX];
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * Answer from an add stream command.
@@ -66,21 +75,21 @@ struct lttcomm_relayd_add_stream {
 struct lttcomm_relayd_status_stream {
        uint64_t handle;
        uint32_t ret_code;
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * Used to return command code for command not needing special data.
  */
 struct lttcomm_relayd_generic_reply {
        uint32_t ret_code;
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * Used to update synchronization information.
  */
 struct lttcomm_relayd_update_sync_info {
        /* TODO: fill the structure. Feature not implemented yet */
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * Version command.
@@ -88,7 +97,7 @@ struct lttcomm_relayd_update_sync_info {
 struct lttcomm_relayd_version {
        uint32_t major;
        uint32_t minor;
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * Metadata payload used when metadata command is sent.
@@ -97,7 +106,7 @@ struct lttcomm_relayd_metadata_payload {
        uint64_t stream_id;
        uint32_t padding_size;
        char payload[];
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * Used to indicate that a specific stream id can now be closed.
@@ -105,7 +114,7 @@ struct lttcomm_relayd_metadata_payload {
 struct lttcomm_relayd_close_stream {
        uint64_t stream_id;
        uint64_t last_net_seq_num;      /* sequence number of last packet */
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
 
 /*
  * Used to test if for a given stream id the data is pending on the relayd side
@@ -114,6 +123,14 @@ struct lttcomm_relayd_close_stream {
 struct lttcomm_relayd_data_pending {
        uint64_t stream_id;
        uint64_t last_net_seq_num; /* Sequence number of the last packet */
-} __attribute__ ((__packed__));
+} LTTNG_PACKED;
+
+struct lttcomm_relayd_begin_data_pending {
+       uint64_t session_id;
+} LTTNG_PACKED;
+
+struct lttcomm_relayd_end_data_pending {
+       uint64_t session_id;
+} LTTNG_PACKED;
 
 #endif /* _RELAYD_COMM */