Fix handling of sessiond respawn after a SIGKILL

[lttng-tools.git] / liblttsessiondcomm / liblttsessiondcomm.h

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index ab9fd7b5a4ee3a578f3cc1e78f1282cd0156ec7f..a06bb91757405fe4ad3a3ff56a36613f840577fe 100644 (file)
--- a/liblttsessiondcomm/liblttsessiondcomm.h
+++ b/liblttsessiondcomm/liblttsessiondcomm.h
@@ -41,24 +41,25 @@
 #define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
 
 enum lttcomm_sessiond_command {
-       /* Tracer context command */
-       LTTNG_KERNEL_ADD_CONTEXT,
-       LTTNG_KERNEL_DISABLE_CHANNEL,
-       LTTNG_KERNEL_DISABLE_EVENT,
-       LTTNG_KERNEL_DISABLE_ALL_EVENT,
-       LTTNG_KERNEL_ENABLE_CHANNEL,
-       LTTNG_KERNEL_ENABLE_EVENT,
-       LTTNG_KERNEL_ENABLE_ALL_EVENT,
-       LTTNG_KERNEL_LIST_EVENTS,
-       /* Session daemon context command */
+       /* 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_LIST_SESSIONS,
-       LTTNG_LIST_TRACES,
+       LTTNG_LIST_CHANNELS,
+       LTTNG_LIST_DOMAINS,
        LTTNG_LIST_EVENTS,
-       LTTNG_LIST_TRACEABLE_APPS,
+       LTTNG_LIST_SESSIONS,
+       LTTNG_LIST_TRACEPOINTS,
        LTTNG_START_TRACE,
        LTTNG_STOP_TRACE,
+       LTTNG_CALIBRATE,
 };
 
 /*
@@ -126,9 +127,8 @@ enum lttcomm_return_code {
  */
 struct lttcomm_session_msg {
        u32 cmd_type;    /* enum lttcomm_sessiond_command */
-       char session_name[NAME_MAX];
-       char path[PATH_MAX];
-       pid_t pid;
+       struct lttng_session session;
+       struct lttng_domain domain;
        union {
                struct {
                        char channel_name[NAME_MAX];
@@ -149,6 +149,11 @@ struct lttcomm_session_msg {
                        char event_name[NAME_MAX];
                        struct lttng_event_context ctx;
                } context;
+               /* List */
+               struct {
+                       char channel_name[NAME_MAX];
+               } list;
+               struct lttng_calibrate calibrate;
        } u;
 };