X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=8891557c1bdcb4faf011396176e8fc2f82fdcada;hb=44635d77b591f83a80d48cd93497bd1cd6aa788d;hp=d1a2bd97de18574b82344a6cc52fa169c4ec3a14;hpb=fbc9f37df245d544a7705ba576297df791220b44;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index d1a2bd97d..8891557c1 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -109,6 +109,99 @@ enum lttcomm_sessiond_command {
 	LTTNG_LIST_TRIGGERS                             = 51,
 };
 
+static inline
+const char *lttcomm_sessiond_command_str(enum lttcomm_sessiond_command cmd)
+{
+	switch (cmd) {
+	case LTTNG_ADD_CONTEXT:
+		return "LTTNG_ADD_CONTEXT";
+	case LTTNG_DISABLE_CHANNEL:
+		return "LTTNG_DISABLE_CHANNEL";
+	case LTTNG_DISABLE_EVENT:
+		return "LTTNG_DISABLE_EVENT";
+	case LTTNG_LIST_SYSCALLS:
+		return "LTTNG_LIST_SYSCALLS";
+	case LTTNG_ENABLE_CHANNEL:
+		return "LTTNG_ENABLE_CHANNEL";
+	case LTTNG_ENABLE_EVENT:
+		return "LTTNG_ENABLE_EVENT";
+	case LTTNG_DESTROY_SESSION:
+		return "LTTNG_DESTROY_SESSION";
+	case LTTNG_LIST_CHANNELS:
+		return "LTTNG_LIST_CHANNELS";
+	case LTTNG_LIST_DOMAINS:
+		return "LTTNG_LIST_DOMAINS";
+	case LTTNG_LIST_EVENTS:
+		return "LTTNG_LIST_EVENTS";
+	case LTTNG_LIST_SESSIONS:
+		return "LTTNG_LIST_SESSIONS";
+	case LTTNG_LIST_TRACEPOINTS:
+		return "LTTNG_LIST_TRACEPOINTS";
+	case LTTNG_REGISTER_CONSUMER:
+		return "LTTNG_REGISTER_CONSUMER";
+	case LTTNG_START_TRACE:
+		return "LTTNG_START_TRACE";
+	case LTTNG_STOP_TRACE:
+		return "LTTNG_STOP_TRACE";
+	case LTTNG_LIST_TRACEPOINT_FIELDS:
+		return "LTTNG_LIST_TRACEPOINT_FIELDS";
+	case LTTNG_DISABLE_CONSUMER:
+		return "LTTNG_DISABLE_CONSUMER";
+	case LTTNG_ENABLE_CONSUMER:
+		return "LTTNG_ENABLE_CONSUMER";
+	case LTTNG_SET_CONSUMER_URI:
+		return "LTTNG_SET_CONSUMER_URI";
+	case LTTNG_DATA_PENDING:
+		return "LTTNG_DATA_PENDING";
+	case LTTNG_SNAPSHOT_ADD_OUTPUT:
+		return "LTTNG_SNAPSHOT_ADD_OUTPUT";
+	case LTTNG_SNAPSHOT_DEL_OUTPUT:
+		return "LTTNG_SNAPSHOT_DEL_OUTPUT";
+	case LTTNG_SNAPSHOT_LIST_OUTPUT:
+		return "LTTNG_SNAPSHOT_LIST_OUTPUT";
+	case LTTNG_SNAPSHOT_RECORD:
+		return "LTTNG_SNAPSHOT_RECORD";
+	case LTTNG_SAVE_SESSION:
+		return "LTTNG_SAVE_SESSION";
+	case LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE:
+		return "LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE";
+	case LTTNG_PROCESS_ATTR_TRACKER_REMOVE_INCLUDE_VALUE:
+		return "LTTNG_PROCESS_ATTR_TRACKER_REMOVE_INCLUDE_VALUE";
+	case LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY:
+		return "LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY";
+	case LTTNG_PROCESS_ATTR_TRACKER_SET_POLICY:
+		return "LTTNG_PROCESS_ATTR_TRACKER_SET_POLICY";
+	case LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET:
+		return "LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET";
+	case LTTNG_SET_SESSION_SHM_PATH:
+		return "LTTNG_SET_SESSION_SHM_PATH";
+	case LTTNG_REGENERATE_METADATA:
+		return "LTTNG_REGENERATE_METADATA";
+	case LTTNG_REGENERATE_STATEDUMP:
+		return "LTTNG_REGENERATE_STATEDUMP";
+	case LTTNG_REGISTER_TRIGGER:
+		return "LTTNG_REGISTER_TRIGGER";
+	case LTTNG_UNREGISTER_TRIGGER:
+		return "LTTNG_UNREGISTER_TRIGGER";
+	case LTTNG_ROTATE_SESSION:
+		return "LTTNG_ROTATE_SESSION";
+	case LTTNG_ROTATION_GET_INFO:
+		return "LTTNG_ROTATION_GET_INFO";
+	case LTTNG_ROTATION_SET_SCHEDULE:
+		return "LTTNG_ROTATION_SET_SCHEDULE";
+	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
+		return "LTTNG_SESSION_LIST_ROTATION_SCHEDULES";
+	case LTTNG_CREATE_SESSION_EXT:
+		return "LTTNG_CREATE_SESSION_EXT";
+	case LTTNG_CLEAR_SESSION:
+		return "LTTNG_CLEAR_SESSION";
+	case LTTNG_LIST_TRIGGERS:
+		return "LTTNG_LIST_TRIGGERS";
+	default:
+		abort();
+	}
+}
+
 enum lttcomm_relayd_command {
 	RELAYD_ADD_STREAM                   = 1,
 	RELAYD_CREATE_SESSION               = 2,
@@ -429,7 +522,7 @@ struct lttcomm_session_msg {
  * starts at reloc_table_offset.
  */
 #define LTTNG_FILTER_PADDING	32
-struct lttng_filter_bytecode {
+struct lttng_bytecode {
 	uint32_t len;	/* len of data */
 	uint32_t reloc_table_offset;
 	uint64_t seqnum;
@@ -767,11 +860,11 @@ struct lttcomm_ust_msg {
 	uint32_t handle;
 	uint32_t cmd;
 	union {
-		struct lttng_ust_channel channel;
-		struct lttng_ust_stream stream;
-		struct lttng_ust_event event;
-		struct lttng_ust_context context;
-		struct lttng_ust_tracer_version version;
+		struct lttng_ust_abi_channel channel;
+		struct lttng_ust_abi_stream stream;
+		struct lttng_ust_abi_event event;
+		struct lttng_ust_abi_context context;
+		struct lttng_ust_abi_tracer_version version;
 	} u;
 } LTTNG_PACKED;
 
@@ -791,7 +884,7 @@ struct lttcomm_ust_reply {
 		struct {
 			uint64_t memory_map_size;
 		} LTTNG_PACKED stream;
-		struct lttng_ust_tracer_version version;
+		struct lttng_ust_abi_tracer_version version;
 	} u;
 } LTTNG_PACKED;