X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-sessiond.h;h=9d0b9abd5dd40e2fe8b2b35cadaf4317e5e36952;hp=ae73507620a8b7ea02c7afdc1d75efa6a30c34bc;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=971a61c658e35f7e2a71040455a273320b409636

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index ae7350762..9d0b9abd5 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2013 - Raphaël Beamonte <raphael.beamonte@gmail.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2013 Raphaël Beamonte <raphael.beamonte@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _LTT_SESSIOND_H
@@ -23,8 +13,10 @@
 #include <urcu/wfcqueue.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
+#include <common/payload.h>
 #include <common/compat/poll.h>
 #include <common/compat/socket.h>
+#include <common/uuid.h>
 
 #include "session.h"
 #include "ust-app.h"
@@ -41,6 +33,9 @@ enum consumerd_state {
 	CONSUMER_ERROR   = 3,
 };
 
+/* Unique identifier of a session daemon instance. */
+extern lttng_uuid sessiond_uuid;
+
 /*
  * This consumer daemon state is used to validate if a client command will be
  * able to reach the consumer. If not, the client is informed. For instance,
@@ -71,23 +66,24 @@ extern const char default_home_dir[],
 	default_global_apps_pipe[];
 
 /* Set in main.c at boot time of the daemon */
-extern int kernel_tracer_fd;
 extern struct lttng_kernel_tracer_version kernel_tracer_version;
 extern struct lttng_kernel_tracer_abi_version kernel_tracer_abi_version;
 
 /* Notification thread handle. */
 extern struct notification_thread_handle *notification_thread_handle;
+extern pthread_mutex_t notification_trigger_tokens_ht_lock;
 
 /*
  * This contains extra data needed for processing a command received by the
  * session daemon from the lttng client.
  */
 struct command_ctx {
-	int ust_sock;
 	unsigned int lttng_msg_size;
 	struct ltt_session *session;
-	struct lttcomm_lttng_msg *llm;
-	struct lttcomm_session_msg *lsm;
+	/* Input message */
+	struct lttcomm_session_msg lsm;
+	/* Reply content, starts with an lttcomm_lttng_msg header. */
+	struct lttng_payload reply_payload;
 	lttng_sock_cred creds;
 };
 
@@ -147,8 +143,6 @@ extern struct health_app *health_sessiond;
 
 extern struct sessiond_config config;
 
-extern int lttng_sessiond_ready;
-
 extern int ust_consumerd64_fd, ust_consumerd32_fd;
 
 /* Parent PID for --sig-parent option */
@@ -163,12 +157,11 @@ extern struct consumer_data kconsumer_data;
 
 int sessiond_init_thread_quit_pipe(void);
 int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
-int sessiond_wait_for_quit_pipe(unsigned int timeout_us);
+int sessiond_wait_for_quit_pipe(int timeout_ms);
 int sessiond_notify_quit_pipe(void);
 void sessiond_close_quit_pipe(void);
 
 int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
-void sessiond_notify_ready(void);
 void sessiond_signal_parents(void);
 
 void sessiond_set_client_thread_state(bool running);