X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.h;h=a06bb91757405fe4ad3a3ff56a36613f840577fe;hp=1950408222043d266f6fd69b83d3b9131bcf3024;hb=7d8234d9e6f162ee642cdbec911f46c29b012c3d;hpb=33a2b85433875769e92ca44a680c46b9498f5174

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index 195040822..a06bb9175 100644
--- a/liblttsessiondcomm/liblttsessiondcomm.h
+++ b/liblttsessiondcomm/liblttsessiondcomm.h
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,8 +22,8 @@
 #define _LIBLTTSESSIONDCOMM_H
 
 #include <limits.h>
-#include <uuid/uuid.h>
 
+#include <lttng/lttng.h>
 #include "lttng-share.h"
 
 /* Default unix socket path */
@@ -41,38 +41,25 @@
 #define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
 
 enum lttcomm_sessiond_command {
-	KERNEL_CREATE_CHANNEL,
-	KERNEL_CREATE_SESSION,
-	KERNEL_CREATE_STREAM,
-	KERNEL_DISABLE_EVENT,
-	KERNEL_ENABLE_EVENT,
-	KERNEL_ENABLE_ALL_EVENT,
-	KERNEL_LIST_EVENTS,
-	KERNEL_OPEN_METADATA,
-	KERNEL_START_TRACE,
-	KERNEL_STOP_TRACE,
+	/* Tracer command */
+	LTTNG_ADD_CONTEXT,
+	LTTNG_DISABLE_CHANNEL,
+	LTTNG_DISABLE_EVENT,
+	LTTNG_DISABLE_ALL_EVENT,
+	LTTNG_ENABLE_CHANNEL,
+	LTTNG_ENABLE_EVENT,
+	LTTNG_ENABLE_ALL_EVENT,
+	/* Session daemon command */
 	LTTNG_CREATE_SESSION,
 	LTTNG_DESTROY_SESSION,
-	LTTNG_FORCE_SUBBUF_SWITCH,
-	LTTNG_GET_ALL_SESSION,
-	LTTNG_GET_SOCK_PATH,
-	LTTNG_GET_SUBBUF_NUM_SIZE,
-	LTTNG_LIST_MARKERS,
+	LTTNG_LIST_CHANNELS,
+	LTTNG_LIST_DOMAINS,
+	LTTNG_LIST_EVENTS,
 	LTTNG_LIST_SESSIONS,
-	LTTNG_LIST_TRACES,
-	LTTNG_LIST_TRACE_EVENTS,
-	LTTNG_SETUP_TRACE,
-	LTTNG_SET_SOCK_PATH,
-	LTTNG_SET_SUBBUF_NUM,
-	LTTNG_SET_SUBBUF_SIZE,
-	UST_ALLOC_TRACE,
-	UST_CREATE_TRACE,
-	UST_DESTROY_TRACE,
-	UST_DISABLE_MARKER,
-	UST_ENABLE_MARKER,
-	UST_LIST_APPS,
-	UST_START_TRACE,
-	UST_STOP_TRACE,
+	LTTNG_LIST_TRACEPOINTS,
+	LTTNG_START_TRACE,
+	LTTNG_STOP_TRACE,
+	LTTNG_CALIBRATE,
 };
 
 /*
@@ -82,6 +69,8 @@ enum lttcomm_return_code {
 	LTTCOMM_OK = 1000,				/* Ok */
 	LTTCOMM_ERR,					/* Unknown Error */
 	LTTCOMM_UND,					/* Undefine command */
+	LTTCOMM_NOT_IMPLEMENTED,        /* Command not implemented */
+	LTTCOMM_UNKNOWN_DOMAIN,         /* Tracing domain not known */
 	LTTCOMM_ALLOC_FAIL,				/* Trace allocation fail */
 	LTTCOMM_NO_SESSION,				/* No session found */
 	LTTCOMM_CREATE_FAIL,			/* Create trace fail */
@@ -90,7 +79,7 @@ enum lttcomm_return_code {
 	LTTCOMM_STOP_FAIL,				/* Stop tracing fail */
 	LTTCOMM_LIST_FAIL,				/* Listing apps fail */
 	LTTCOMM_NO_APPS,				/* No traceable application */
-	LTTCOMM_NO_SESS,				/* No sessions available */
+	LTTCOMM_SESS_NOT_FOUND,			/* Session name not found */
 	LTTCOMM_NO_TRACE,				/* No trace exist */
 	LTTCOMM_FATAL,					/* Session daemon had a fatal error */
 	LTTCOMM_NO_TRACEABLE,			/* Error for non traceable app */
@@ -98,8 +87,13 @@ enum lttcomm_return_code {
 	LTTCOMM_EXIST_SESS,				/* Session name already exist */
 	LTTCOMM_NO_EVENT,				/* No event found */
 	LTTCOMM_KERN_NA,				/* Kernel tracer unavalable */
+	LTTCOMM_KERN_EVENT_EXIST,       /* Kernel event already exists */
 	LTTCOMM_KERN_SESS_FAIL,			/* Kernel create session failed */
 	LTTCOMM_KERN_CHAN_FAIL,			/* Kernel create channel failed */
+	LTTCOMM_KERN_CHAN_NOT_FOUND,	/* Kernel channel not found */
+	LTTCOMM_KERN_CHAN_DISABLE_FAIL, /* Kernel disable channel failed */
+	LTTCOMM_KERN_CHAN_ENABLE_FAIL,  /* Kernel enable channel failed */
+	LTTCOMM_KERN_CONTEXT_FAIL,      /* Kernel add context failed */
 	LTTCOMM_KERN_ENABLE_FAIL,		/* Kernel enable event failed */
 	LTTCOMM_KERN_DISABLE_FAIL,		/* Kernel disable event failed */
 	LTTCOMM_KERN_META_FAIL,			/* Kernel open metadata failed */
@@ -133,18 +127,33 @@ enum lttcomm_return_code {
  */
 struct lttcomm_session_msg {
 	u32 cmd_type;    /* enum lttcomm_sessiond_command */
-	uuid_t session_uuid;
-	char trace_name[NAME_MAX];
-	char session_name[NAME_MAX];
-	u32 pid;    /* pid_t */
+	struct lttng_session session;
+	struct lttng_domain domain;
 	union {
 		struct {
-			int auto_session;
-		} create_session;
-		/* Marker data */
+			char channel_name[NAME_MAX];
+			char name[NAME_MAX];
+		} disable;
+		/* Event data */
 		struct {
+			char channel_name[NAME_MAX];
+			struct lttng_event event;
+		} enable;
+		/* Create channel */
+		struct {
+			struct lttng_channel chan;
+		} channel;
+		/* Context */
+		struct {
+			char channel_name[NAME_MAX];
 			char event_name[NAME_MAX];
-		} event;
+			struct lttng_event_context ctx;
+		} context;
+		/* List */
+		struct {
+			char channel_name[NAME_MAX];
+		} list;
+		struct lttng_calibrate calibrate;
 	} u;
 };
 
@@ -155,9 +164,7 @@ struct lttcomm_lttng_msg {
 	u32 cmd_type;   /* enum lttcomm_sessiond_command */
 	u32 ret_code;   /* enum lttcomm_return_code */
 	u32 pid;        /* pid_t */
-	u32 trace_name_offset;
 	u32 data_size;
-	uuid_t session_uuid;
 	/* Contains: trace_name + data */
 	char payload[];
 };