Fix: lay out names in exclusion structure correctly

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

diff --git a/src/common/sessiond-comm/agent.h b/src/common/sessiond-comm/agent.h
index 574f8891f20bc8211e1160e3038d2c97ec1b9707..e8d182515888cd0273ec8622eb8f47861ec8fc90 100644 (file)
--- a/src/common/sessiond-comm/agent.h
+++ b/src/common/sessiond-comm/agent.h
@@ -18,13 +18,12 @@
 #ifndef AGENT_COMM
 #define AGENT_COMM
 
-#define _GNU_SOURCE
 #include <stdint.h>
 
 #include <lttng/lttng.h>
 
 /*
- * Command value pass in the header.
+ * Command value passed in the header.
  */
 enum lttcomm_agent_command {
        AGENT_CMD_LIST       = 1,
@@ -34,11 +33,14 @@ enum lttcomm_agent_command {
 };
 
 /*
- * Return code from the Java agent.
+ * Return codes from the agent.
  */
 enum lttcomm_agent_ret_code {
+       /* Success, assumed to be the first entry */
        AGENT_RET_CODE_SUCCESS      = 1,
+       /* Invalid command */
        AGENT_RET_CODE_INVALID      = 2,
+       /* Unknown logger name */
        AGENT_RET_CODE_UNKNOWN_NAME = 3,
        AGENT_RET_CODE_NR,
 };
@@ -53,12 +55,14 @@ struct lttcomm_agent_hdr {
 } LTTNG_PACKED;
 
 /*
- * Enable event command payload.
+ * Enable event command payload. Will be immediately followed by the
+ * variable-length string representing the filter expression.
  */
 struct lttcomm_agent_enable {
-       uint32_t loglevel;
+       uint32_t loglevel_value;
        uint32_t loglevel_type;
        char name[LTTNG_SYMBOL_NAME_LEN];
+       uint32_t filter_expression_length;
 } LTTNG_PACKED;
 
 /*
@@ -69,7 +73,7 @@ struct lttcomm_agent_disable {
 } LTTNG_PACKED;
 
 /*
- * Generic reply coming from the Java Agent.
+ * Generic reply coming from the agent.
  */
 struct lttcomm_agent_generic_reply {
        uint32_t ret_code;
@@ -84,7 +88,7 @@ struct lttcomm_agent_list_reply_hdr {
 } LTTNG_PACKED;
 
 /*
- * List command reply payload coming from the Java Agent.
+ * List command reply payload coming from the agent.
  */
 struct lttcomm_agent_list_reply {
        uint32_t nb_event;