X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=af91087644cf3bd58d03d3d8614bcfd614724e8e;hb=21cf9b6b1843774306a76f4dccddddd706b64f79;hp=65020bbfcd098a9b22f4d1e15abfa6b41e8ed9cd;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 65020bbfc..af9108764 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
@@ -37,10 +36,6 @@
 #include "inet6.h"
 #include <common/unix.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
 
@@ -52,11 +47,6 @@ extern "C" {
 #define LTTCOMM_MAX_SEND_FDS           16
 #endif
 
-/*
- * Get the error code index from 0 since LTTCOMM_OK start at 1000
- */
-#define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_CONSUMERD_COMMAND_SOCK_READY)
-
 enum lttcomm_sessiond_command {
 	/* Tracer command */
 	LTTNG_ADD_CONTEXT                               = 0,
@@ -244,6 +234,59 @@ enum lttcomm_relayd_command {
 	/* Feature branch specific commands start at 10000. */
 };
 
+static inline
+const char *lttcomm_relayd_command_str(lttcomm_relayd_command cmd)
+{
+	switch (cmd) {
+	case RELAYD_ADD_STREAM:
+		return "RELAYD_ADD_STREAM";
+	case RELAYD_CREATE_SESSION:
+		return "RELAYD_CREATE_SESSION";
+	case RELAYD_START_DATA:
+		return "RELAYD_START_DATA";
+	case RELAYD_UPDATE_SYNC_INFO:
+		return "RELAYD_UPDATE_SYNC_INFO";
+	case RELAYD_VERSION:
+		return "RELAYD_VERSION";
+	case RELAYD_SEND_METADATA:
+		return "RELAYD_SEND_METADATA";
+	case RELAYD_CLOSE_STREAM:
+		return "RELAYD_CLOSE_STREAM";
+	case RELAYD_DATA_PENDING:
+		return "RELAYD_DATA_PENDING";
+	case RELAYD_QUIESCENT_CONTROL:
+		return "RELAYD_QUIESCENT_CONTROL";
+	case RELAYD_BEGIN_DATA_PENDING:
+		return "RELAYD_BEGIN_DATA_PENDING";
+	case RELAYD_END_DATA_PENDING:
+		return "RELAYD_END_DATA_PENDING";
+	case RELAYD_ADD_INDEX:
+		return "RELAYD_ADD_INDEX";
+	case RELAYD_SEND_INDEX:
+		return "RELAYD_SEND_INDEX";
+	case RELAYD_CLOSE_INDEX:
+		return "RELAYD_CLOSE_INDEX";
+	case RELAYD_LIST_SESSIONS:
+		return "RELAYD_LIST_SESSIONS";
+	case RELAYD_STREAMS_SENT:
+		return "RELAYD_STREAMS_SENT";
+	case RELAYD_RESET_METADATA:
+		return "RELAYD_RESET_METADATA";
+	case RELAYD_ROTATE_STREAMS:
+		return "RELAYD_ROTATE_STREAMS";
+	case RELAYD_CREATE_TRACE_CHUNK:
+		return "RELAYD_CREATE_TRACE_CHUNK";
+	case RELAYD_CLOSE_TRACE_CHUNK:
+		return "RELAYD_CLOSE_TRACE_CHUNK";
+	case RELAYD_TRACE_CHUNK_EXISTS:
+		return "RELAYD_TRACE_CHUNK_EXISTS";
+	case RELAYD_GET_CONFIGURATION:
+		return "RELAYD_GET_CONFIGURATION";
+	default:
+		abort();
+	}
+}
+
 /*
  * lttcomm error code.
  */
@@ -279,7 +322,7 @@ enum lttcomm_return_code {
 	LTTCOMM_CONSUMERD_ROTATION_FAIL,            /* Rotation has failed. */
 	LTTCOMM_CONSUMERD_SNAPSHOT_FAILED,          /* snapshot has failed. */
 	LTTCOMM_CONSUMERD_CREATE_TRACE_CHUNK_FAILED,/* Trace chunk creation failed. */
-	LTTCOMM_CONSUMERD_CLOSE_TRACE_CHUNK_FAILED, /* Trace chunk creation failed. */
+	LTTCOMM_CONSUMERD_CLOSE_TRACE_CHUNK_FAILED, /* Trace chunk close failed. */
 	LTTCOMM_CONSUMERD_INVALID_PARAMETERS,       /* Invalid parameters. */
 	LTTCOMM_CONSUMERD_TRACE_CHUNK_EXISTS_LOCAL, /* Trace chunk exists on consumer daemon. */
 	LTTCOMM_CONSUMERD_TRACE_CHUNK_EXISTS_REMOTE,/* Trace chunk exists on relay daemon. */
@@ -935,8 +978,4 @@ void lttcomm_init(void);
 /* Get network timeout, in milliseconds */
 unsigned long lttcomm_get_network_timeout(void);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _LTTNG_SESSIOND_COMM_H */