From 773168b7255d45fd28f018055292e93b7a76482d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 8 Aug 2011 19:54:04 -0400 Subject: [PATCH] Install lttng/lttng-sessiond-comm.h into system This header is needed by UST 2.0 for communication with the sessiond. Signed-off-by: Mathieu Desnoyers --- include/Makefile.am | 2 +- .../lttng/lttng-sessiond-comm.h | 34 +++++++++++-------- liblttkconsumerd/liblttkconsumerd.h | 2 +- liblttngctl/liblttngctl.c | 2 +- liblttsessiondcomm/liblttsessiondcomm.c | 2 +- ltt-sessiond/context.h | 2 +- ltt-sessiond/main.c | 2 +- ltt-sessiond/ust-ctl.c | 2 +- 8 files changed, 26 insertions(+), 22 deletions(-) rename liblttsessiondcomm/liblttsessiondcomm.h => include/lttng/lttng-sessiond-comm.h (90%) diff --git a/include/Makefile.am b/include/Makefile.am index 1f5dbd95c..4d13e9cbe 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,3 @@ -lttnginclude_HEADERS = lttng/lttng.h +lttnginclude_HEADERS = lttng/lttng.h lttng/lttng-sessiond-comm.h noinst_HEADERS = lttngerr.h lttng-kernel.h lttng-kconsumerd.h lttng-share.h diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/include/lttng/lttng-sessiond-comm.h similarity index 90% rename from liblttsessiondcomm/liblttsessiondcomm.h rename to include/lttng/lttng-sessiond-comm.h index a06bb9175..e361dd8b3 100644 --- a/liblttsessiondcomm/liblttsessiondcomm.h +++ b/include/lttng/lttng-sessiond-comm.h @@ -1,6 +1,10 @@ +#ifndef _LTTNG_SESSIOND_COMM_H +#define _LTTNG_SESSIOND_COMM_H + /* * Copyright (C) 2011 - David Goulet * Julien Desfossez + * Mathieu Desnoyers * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,16 +19,15 @@ * 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. - * */ -#ifndef _LIBLTTSESSIONDCOMM_H -#define _LIBLTTSESSIONDCOMM_H +/* + * This header is meant for liblttng and libust internal use ONLY. + * These declarations should NOT be considered stable API. + */ #include - #include -#include "lttng-share.h" /* Default unix socket path */ #define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK LTTNG_RUNDIR "/client-ltt-sessiond" @@ -126,7 +129,7 @@ enum lttcomm_return_code { * Data structure received from lttng client to session daemon. */ struct lttcomm_session_msg { - u32 cmd_type; /* enum lttcomm_sessiond_command */ + uint32_t cmd_type; /* enum lttcomm_sessiond_command */ struct lttng_session session; struct lttng_domain domain; union { @@ -161,10 +164,10 @@ struct lttcomm_session_msg { * Data structure for the response from sessiond to the lttng client. */ struct lttcomm_lttng_msg { - u32 cmd_type; /* enum lttcomm_sessiond_command */ - u32 ret_code; /* enum lttcomm_return_code */ - u32 pid; /* pid_t */ - u32 data_size; + 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[]; }; @@ -176,8 +179,8 @@ struct lttcomm_lttng_msg { * how many lttcomm_kconsumerd_msg it is about to receive */ struct lttcomm_kconsumerd_header { - u32 payload_size; - u32 cmd_type; /* enum kconsumerd_command */ + uint32_t payload_size; + uint32_t cmd_type; /* enum kconsumerd_command */ }; /* lttcomm_kconsumerd_msg represents a file descriptor to consume the @@ -186,7 +189,7 @@ struct lttcomm_kconsumerd_header { struct lttcomm_kconsumerd_msg { char path_name[PATH_MAX]; int fd; - u32 state; /* enum lttcomm_kconsumerd_fd_state */ + uint32_t state; /* enum lttcomm_kconsumerd_fd_state */ unsigned long max_sb_size; /* the subbuffer size for this channel */ }; @@ -195,9 +198,10 @@ 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); -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_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 /* _LIBLTTSESSIONDCOMM_H */ +#endif /* _LTTNG_SESSIOND_COMM_H */ diff --git a/liblttkconsumerd/liblttkconsumerd.h b/liblttkconsumerd/liblttkconsumerd.h index 73cd29e27..d085a7950 100644 --- a/liblttkconsumerd/liblttkconsumerd.h +++ b/liblttkconsumerd/liblttkconsumerd.h @@ -19,8 +19,8 @@ #ifndef _LIBLTTKCONSUMERD_H #define _LIBLTTKCONSUMERD_H +#include #include "lttng-kconsumerd.h" -#include "liblttsessiondcomm.h" /* * When the receiving thread dies, we need to have a way to make diff --git a/liblttngctl/liblttngctl.c b/liblttngctl/liblttngctl.c index 2464bce3b..de1821032 100644 --- a/liblttngctl/liblttngctl.c +++ b/liblttngctl/liblttngctl.c @@ -30,7 +30,7 @@ #include -#include "liblttsessiondcomm.h" +#include #include "lttngerr.h" #include "lttng-share.h" diff --git a/liblttsessiondcomm/liblttsessiondcomm.c b/liblttsessiondcomm/liblttsessiondcomm.c index cffeb72c0..296782401 100644 --- a/liblttsessiondcomm/liblttsessiondcomm.c +++ b/liblttsessiondcomm/liblttsessiondcomm.c @@ -28,7 +28,7 @@ #include #include -#include "liblttsessiondcomm.h" +#include /* * Human readable error message. diff --git a/ltt-sessiond/context.h b/ltt-sessiond/context.h index 490fef50e..b107c9c3c 100644 --- a/ltt-sessiond/context.h +++ b/ltt-sessiond/context.h @@ -23,8 +23,8 @@ #include #include +#include -#include "liblttsessiondcomm.h" #include "lttng-kernel.h" #include "kernel-ctl.h" #include "trace.h" diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c index 38230dbba..64493521b 100644 --- a/ltt-sessiond/main.c +++ b/ltt-sessiond/main.c @@ -41,9 +41,9 @@ #include /* URCU list library (-lurcu) */ #include +#include #include "context.h" -#include "liblttsessiondcomm.h" #include "ltt-sessiond.h" #include "lttngerr.h" #include "kernel-ctl.h" diff --git a/ltt-sessiond/ust-ctl.c b/ltt-sessiond/ust-ctl.c index 7c8cc5ebb..abee38817 100644 --- a/ltt-sessiond/ust-ctl.c +++ b/ltt-sessiond/ust-ctl.c @@ -23,7 +23,7 @@ #include #include -#include "liblttsessiondcomm.h" +#include #include "lttngerr.h" #include "ust-ctl.h" -- 2.34.1