Privatize lttng-sessiond-comm
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Thu, 11 Aug 2011 22:16:14 +0000 (18:16 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Thu, 11 Aug 2011 22:17:57 +0000 (18:17 -0400)
With the intent of keeping libust, which is really an instrumentation
library, stand-alone, we prefer not to make it depend on a library from
the lttng-tools tree. Therefore, we privatize lttng-sessiond-comm, and
both package will interact through a communication protocol rather than
a shared library.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
include/Makefile.am
include/lttng-kconsumerd.h
include/lttng-sessiond-comm.h [new file with mode: 0644]
include/lttng/lttng-sessiond-comm.h [deleted file]
liblttkconsumerd/lttkconsumerd.h
liblttng-sessiond-comm/Makefile.am
liblttng-sessiond-comm/lttng-sessiond-comm.c
liblttngctl/lttngctl.c
ltt-sessiond/context.h
ltt-sessiond/main.c
ltt-sessiond/ust-ctl.c

index 4d13e9cbe4e61ae4b33e1c24230d383bb72440ad..dc3f0b5539b6f82233c298cf99b6033ea65f9549 100644 (file)
@@ -1,3 +1,4 @@
-lttnginclude_HEADERS = lttng/lttng.h lttng/lttng-sessiond-comm.h
+lttnginclude_HEADERS = lttng/lttng.h
 
-noinst_HEADERS = lttngerr.h lttng-kernel.h lttng-kconsumerd.h lttng-share.h
+noinst_HEADERS = lttngerr.h lttng-kernel.h lttng-kconsumerd.h lttng-share.h \
+               lttng-sessiond-comm.h
index 8dd57cff1e24d504a9834c0c8dcf4e3873e7da02..ec3a9e2b554fb397f23bde0775db8f93ada35c68 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef _LTTNG_KCONSUMERD_H
 #define _LTTNG_KCONSUMERD_H
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttng-share.h"
 
 /* Kernel consumer path */
diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
new file mode 100644 (file)
index 0000000..be903a6
--- /dev/null
@@ -0,0 +1,210 @@
+#ifndef _LTTNG_SESSIOND_COMM_H
+#define _LTTNG_SESSIOND_COMM_H
+
+/*
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ *                      Julien Desfossez <julien.desfossez@polymtl.ca>
+ *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * 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; 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*
+ * This header is meant for liblttng and libust internal use ONLY.
+ * These declarations should NOT be considered stable API.
+ */
+
+#include <limits.h>
+#include <lttng/lttng.h>
+
+#define LTTNG_RUNDIR                        "/var/run/lttng"
+
+/* Default unix socket path */
+#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK     LTTNG_RUNDIR "/client-ltt-sessiond"
+#define DEFAULT_GLOBAL_APPS_UNIX_SOCK       LTTNG_RUNDIR "/apps-ltt-sessiond"
+#define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-ltt-sessiond"
+#define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-ltt-sessiond"
+
+/* Queue size of listen(2) */
+#define MAX_LISTEN 10
+
+/* Get the error code index from 0 since
+ * LTTCOMM_OK start at 1000
+ */
+#define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
+
+enum lttcomm_sessiond_command {
+       /* Tracer command */
+       LTTNG_ADD_CONTEXT,
+       LTTNG_CALIBRATE,
+       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_CHANNELS,
+       LTTNG_LIST_DOMAINS,
+       LTTNG_LIST_EVENTS,
+       LTTNG_LIST_SESSIONS,
+       LTTNG_LIST_TRACEPOINTS,
+       LTTNG_START_TRACE,
+       LTTNG_STOP_TRACE,
+};
+
+/*
+ * lttcomm error code.
+ */
+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 */
+       LTTCOMM_SESSION_FAIL,                   /* Create session fail */
+       LTTCOMM_START_FAIL,                             /* Start tracing fail */
+       LTTCOMM_STOP_FAIL,                              /* Stop tracing fail */
+       LTTCOMM_LIST_FAIL,                              /* Listing apps fail */
+       LTTCOMM_NO_APPS,                                /* No traceable application */
+       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 */
+       LTTCOMM_SELECT_SESS,                    /* Must select a session */
+       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 */
+       LTTCOMM_KERN_START_FAIL,                /* Kernel start trace failed */
+       LTTCOMM_KERN_STOP_FAIL,                 /* Kernel stop trace failed */
+       LTTCOMM_KERN_CONSUMER_FAIL,             /* Kernel consumer start failed */
+       LTTCOMM_KERN_STREAM_FAIL,               /* Kernel create stream failed */
+       LTTCOMM_KERN_DIR_FAIL,                  /* Kernel trace directory creation failed */
+       LTTCOMM_KERN_DIR_EXIST,                 /* Kernel trace directory exist */
+       LTTCOMM_KERN_NO_SESSION,                /* No kernel session found */
+       LTTCOMM_KERN_LIST_FAIL,                 /* Kernel listing events failed */
+       KCONSUMERD_COMMAND_SOCK_READY,  /* when kconsumerd command socket ready */
+       KCONSUMERD_SUCCESS_RECV_FD,             /* success on receiving fds */
+       KCONSUMERD_ERROR_RECV_FD,               /* error on receiving fds */
+       KCONSUMERD_POLL_ERROR,                  /* Error in polling thread in kconsumerd */
+       KCONSUMERD_POLL_NVAL,                   /* Poll on closed fd */
+       KCONSUMERD_POLL_HUP,                    /* All fds have hungup */
+       KCONSUMERD_EXIT_SUCCESS,                /* kconsumerd exiting normally */
+       KCONSUMERD_EXIT_FAILURE,                /* kconsumerd exiting on error */
+       KCONSUMERD_OUTFD_ERROR,                 /* error opening the tracefile */
+       KCONSUMERD_SPLICE_EBADF,                /* EBADF from splice(2) */
+       KCONSUMERD_SPLICE_EINVAL,               /* EINVAL from splice(2) */
+       KCONSUMERD_SPLICE_ENOMEM,               /* ENOMEM from splice(2) */
+       KCONSUMERD_SPLICE_ESPIPE,               /* ESPIPE from splice(2) */
+       /* MUST be last element */
+       LTTCOMM_NR,                                             /* Last element */
+};
+
+/*
+ * Data structure received from lttng client to session daemon.
+ */
+struct lttcomm_session_msg {
+       uint32_t cmd_type;    /* enum lttcomm_sessiond_command */
+       struct lttng_session session;
+       struct lttng_domain domain;
+       union {
+               struct {
+                       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];
+                       struct lttng_event_context ctx;
+               } context;
+               /* List */
+               struct {
+                       char channel_name[NAME_MAX];
+               } list;
+               struct lttng_calibrate calibrate;
+       } u;
+};
+
+/*
+ * Data structure for the response from sessiond to the lttng client.
+ */
+struct lttcomm_lttng_msg {
+       uint32_t cmd_type;   /* enum lttcomm_sessiond_command */
+       uint32_t ret_code;   /* enum lttcomm_return_code */
+       uint32_t pid;        /* pid_t */
+       uint32_t data_size;
+       /* Contains: trace_name + data */
+       char payload[];
+};
+
+/*
+ * Data structures for the kconsumerd communications
+ *
+ * The header structure is sent to the kconsumerd daemon to inform
+ * how many lttcomm_kconsumerd_msg it is about to receive
+ */
+struct lttcomm_kconsumerd_header {
+       uint32_t payload_size;
+       uint32_t cmd_type;      /* enum kconsumerd_command */
+};
+
+/* lttcomm_kconsumerd_msg represents a file descriptor to consume the
+ * data and a path name to write it
+ */
+struct lttcomm_kconsumerd_msg {
+       char path_name[PATH_MAX];
+       int fd;
+       uint32_t state;    /* enum lttcomm_kconsumerd_fd_state */
+       unsigned long max_sb_size; /* the subbuffer size for this channel */
+};
+
+extern int lttcomm_create_unix_sock(const char *pathname);
+extern int lttcomm_connect_unix_sock(const char *pathname);
+extern int lttcomm_accept_unix_sock(int sock);
+extern int lttcomm_listen_unix_sock(int sock);
+extern int lttcomm_close_unix_sock(int sock);
+/* Send fd(s) over a unix socket. */
+extern ssize_t lttcomm_send_fds_unix_sock(int sock, void *buf, int *fds,
+               size_t nb_fd, size_t len);
+extern ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len);
+extern ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len);
+extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code);
+
+#endif /* _LTTNG_SESSIOND_COMM_H */
diff --git a/include/lttng/lttng-sessiond-comm.h b/include/lttng/lttng-sessiond-comm.h
deleted file mode 100644 (file)
index be903a6..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifndef _LTTNG_SESSIOND_COMM_H
-#define _LTTNG_SESSIOND_COMM_H
-
-/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Julien Desfossez <julien.desfossez@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * 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; 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/*
- * This header is meant for liblttng and libust internal use ONLY.
- * These declarations should NOT be considered stable API.
- */
-
-#include <limits.h>
-#include <lttng/lttng.h>
-
-#define LTTNG_RUNDIR                        "/var/run/lttng"
-
-/* Default unix socket path */
-#define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK     LTTNG_RUNDIR "/client-ltt-sessiond"
-#define DEFAULT_GLOBAL_APPS_UNIX_SOCK       LTTNG_RUNDIR "/apps-ltt-sessiond"
-#define DEFAULT_HOME_APPS_UNIX_SOCK         "%s/.apps-ltt-sessiond"
-#define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-ltt-sessiond"
-
-/* Queue size of listen(2) */
-#define MAX_LISTEN 10
-
-/* Get the error code index from 0 since
- * LTTCOMM_OK start at 1000
- */
-#define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
-
-enum lttcomm_sessiond_command {
-       /* Tracer command */
-       LTTNG_ADD_CONTEXT,
-       LTTNG_CALIBRATE,
-       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_CHANNELS,
-       LTTNG_LIST_DOMAINS,
-       LTTNG_LIST_EVENTS,
-       LTTNG_LIST_SESSIONS,
-       LTTNG_LIST_TRACEPOINTS,
-       LTTNG_START_TRACE,
-       LTTNG_STOP_TRACE,
-};
-
-/*
- * lttcomm error code.
- */
-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 */
-       LTTCOMM_SESSION_FAIL,                   /* Create session fail */
-       LTTCOMM_START_FAIL,                             /* Start tracing fail */
-       LTTCOMM_STOP_FAIL,                              /* Stop tracing fail */
-       LTTCOMM_LIST_FAIL,                              /* Listing apps fail */
-       LTTCOMM_NO_APPS,                                /* No traceable application */
-       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 */
-       LTTCOMM_SELECT_SESS,                    /* Must select a session */
-       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 */
-       LTTCOMM_KERN_START_FAIL,                /* Kernel start trace failed */
-       LTTCOMM_KERN_STOP_FAIL,                 /* Kernel stop trace failed */
-       LTTCOMM_KERN_CONSUMER_FAIL,             /* Kernel consumer start failed */
-       LTTCOMM_KERN_STREAM_FAIL,               /* Kernel create stream failed */
-       LTTCOMM_KERN_DIR_FAIL,                  /* Kernel trace directory creation failed */
-       LTTCOMM_KERN_DIR_EXIST,                 /* Kernel trace directory exist */
-       LTTCOMM_KERN_NO_SESSION,                /* No kernel session found */
-       LTTCOMM_KERN_LIST_FAIL,                 /* Kernel listing events failed */
-       KCONSUMERD_COMMAND_SOCK_READY,  /* when kconsumerd command socket ready */
-       KCONSUMERD_SUCCESS_RECV_FD,             /* success on receiving fds */
-       KCONSUMERD_ERROR_RECV_FD,               /* error on receiving fds */
-       KCONSUMERD_POLL_ERROR,                  /* Error in polling thread in kconsumerd */
-       KCONSUMERD_POLL_NVAL,                   /* Poll on closed fd */
-       KCONSUMERD_POLL_HUP,                    /* All fds have hungup */
-       KCONSUMERD_EXIT_SUCCESS,                /* kconsumerd exiting normally */
-       KCONSUMERD_EXIT_FAILURE,                /* kconsumerd exiting on error */
-       KCONSUMERD_OUTFD_ERROR,                 /* error opening the tracefile */
-       KCONSUMERD_SPLICE_EBADF,                /* EBADF from splice(2) */
-       KCONSUMERD_SPLICE_EINVAL,               /* EINVAL from splice(2) */
-       KCONSUMERD_SPLICE_ENOMEM,               /* ENOMEM from splice(2) */
-       KCONSUMERD_SPLICE_ESPIPE,               /* ESPIPE from splice(2) */
-       /* MUST be last element */
-       LTTCOMM_NR,                                             /* Last element */
-};
-
-/*
- * Data structure received from lttng client to session daemon.
- */
-struct lttcomm_session_msg {
-       uint32_t cmd_type;    /* enum lttcomm_sessiond_command */
-       struct lttng_session session;
-       struct lttng_domain domain;
-       union {
-               struct {
-                       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];
-                       struct lttng_event_context ctx;
-               } context;
-               /* List */
-               struct {
-                       char channel_name[NAME_MAX];
-               } list;
-               struct lttng_calibrate calibrate;
-       } u;
-};
-
-/*
- * Data structure for the response from sessiond to the lttng client.
- */
-struct lttcomm_lttng_msg {
-       uint32_t cmd_type;   /* enum lttcomm_sessiond_command */
-       uint32_t ret_code;   /* enum lttcomm_return_code */
-       uint32_t pid;        /* pid_t */
-       uint32_t data_size;
-       /* Contains: trace_name + data */
-       char payload[];
-};
-
-/*
- * Data structures for the kconsumerd communications
- *
- * The header structure is sent to the kconsumerd daemon to inform
- * how many lttcomm_kconsumerd_msg it is about to receive
- */
-struct lttcomm_kconsumerd_header {
-       uint32_t payload_size;
-       uint32_t cmd_type;      /* enum kconsumerd_command */
-};
-
-/* lttcomm_kconsumerd_msg represents a file descriptor to consume the
- * data and a path name to write it
- */
-struct lttcomm_kconsumerd_msg {
-       char path_name[PATH_MAX];
-       int fd;
-       uint32_t state;    /* enum lttcomm_kconsumerd_fd_state */
-       unsigned long max_sb_size; /* the subbuffer size for this channel */
-};
-
-extern int lttcomm_create_unix_sock(const char *pathname);
-extern int lttcomm_connect_unix_sock(const char *pathname);
-extern int lttcomm_accept_unix_sock(int sock);
-extern int lttcomm_listen_unix_sock(int sock);
-extern int lttcomm_close_unix_sock(int sock);
-/* Send fd(s) over a unix socket. */
-extern ssize_t lttcomm_send_fds_unix_sock(int sock, void *buf, int *fds,
-               size_t nb_fd, size_t len);
-extern ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len);
-extern ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len);
-extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code);
-
-#endif /* _LTTNG_SESSIOND_COMM_H */
index d085a795067c1cd4b295d24f1b8ce660714b2581..808f414383edd16fdc234a931da7be1c13e09389 100644 (file)
@@ -19,7 +19,7 @@
 #ifndef _LIBLTTKCONSUMERD_H
 #define _LIBLTTKCONSUMERD_H
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttng-kconsumerd.h"
 
 /*
index 47026836bf421edae4967fab4e17db3c043185be..5ddd39ccd2872db7b7170d9374cd1113c7233ffb 100644 (file)
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-lib_LTLIBRARIES = liblttng-sessiond-comm.la
+noinst_LTLIBRARIES = liblttng-sessiond-comm.la
 
-liblttng_sessiond_comm_la_SOURCES = lttng-sessiond-comm.c
+liblttng_sessiond_comm_la_SOURCES = lttng-sessiond-comm.c \
+                                   lttng-sessiond-comm.h
index cecd89d6a5815fc7ee1e472821474afc4785dc39..e370fcd3542b9efddbbf40d90bc904f32264846d 100644 (file)
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <assert.h>
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 
 /*
  * Human readable error message.
index ec01859a9aa00b3394f6bfe29ac89abbfb976ae6..b266797bd1b5aa692559cecd4d555d61a2c3083e 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <lttng/lttng.h>
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttngerr.h"
 #include "lttng-share.h"
 
index b107c9c3c5c18d9471fdc7b458afc8f1a7f653fb..28586521b50e739d95029d2a013779ed006e2c8f 100644 (file)
@@ -23,7 +23,7 @@
 #include <urcu/list.h>
 
 #include <lttng/lttng.h>
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 
 #include "lttng-kernel.h"
 #include "kernel-ctl.h"
index 36d4423ca29d6494babf3d5338b9cc5e3bcc76c8..b1dbc8f97f6fff2b73a961c6a79c1f48e841b1a5 100644 (file)
@@ -41,7 +41,7 @@
 
 #include <urcu/list.h>         /* URCU list library (-lurcu) */
 #include <lttng/lttng.h>
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 
 #include "context.h"
 #include "ltt-sessiond.h"
index d9d4af51a1dc16751bdfd5e26c5412280307526e..fe65fafe2c6f3d00a930c5108595657d91522000 100644 (file)
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <lttng/lttng-sessiond-comm.h>
+#include <lttng-sessiond-comm.h>
 #include "lttngerr.h"
 #include "ust-ctl.h"
 
This page took 0.048121 seconds and 4 git commands to generate.