Remove session daemon kernel list events command

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

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index 8f7ce0317f68c28b99f654a5a43a53a623c5e028..bb965b55cba66e94baa704e8f2f4ff2184410975 100644 (file)
--- 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
@@ -42,21 +42,21 @@
 
 enum lttcomm_sessiond_command {
        /* Tracer context command */
-       LTTNG_KERNEL_CREATE_CHANNEL,
+       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 */
        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,
 };
@@ -68,6 +68,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 */
@@ -84,9 +86,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 */
@@ -122,7 +128,7 @@ 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_domain domain;
        union {
                struct {
                        char channel_name[NAME_MAX];
@@ -137,6 +143,16 @@ struct lttcomm_session_msg {
                struct {
                        struct lttng_channel chan;
                } channel;
+               /* Context */
+               struct {
+                       char channel_name[NAME_MAX];
+                       char event_name[NAME_MAX];
+                       struct lttng_event_context ctx;
+               } context;
+               /* List */
+               struct {
+                       char channel_name[NAME_MAX];
+               } list;
        } u;
 };