X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-sessiond.h;h=0f4c6687892792a338d5a455ad6be574cf07486b;hp=238f27a80c0601e57b443e4812db77d8d863a88d;hb=88564da09144e7fd1202fe79aff1371478a69ecf;hpb=60922cb08cc9fb683c6148da4ff91da8c2c0c4d5

diff --git a/src/bin/lttng-sessiond/lttng-sessiond.h b/src/bin/lttng-sessiond/lttng-sessiond.h
index 238f27a80..0f4c66878 100644
--- a/src/bin/lttng-sessiond/lttng-sessiond.h
+++ b/src/bin/lttng-sessiond/lttng-sessiond.h
@@ -1,19 +1,19 @@
 /*
  * 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
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * 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.
  *
  * 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
+ * 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.
+ * 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
@@ -24,41 +24,21 @@
 #include <urcu/wfqueue.h>
 
 #include <common/sessiond-comm/sessiond-comm.h>
+#include <common/compat/poll.h>
+#include <common/compat/socket.h>
 
 #include "session.h"
 #include "ust-app.h"
-
-struct module_param {
-	const char *name;
-	int required;
-};
-
-/* LTTng kernel tracer modules list */
-const struct module_param kernel_modules_list[] = {
-	{ "lttng-ftrace", 0 },
-	{ "lttng-kprobes", 0 },
-	{ "lttng-kretprobes", 0 },
-	{ "lib-ring-buffer", 1 },
-	{ "ltt-relay", 1 },
-	{ "ltt-ring-buffer-client-discard", 1 },
-	{ "ltt-ring-buffer-client-overwrite", 1 },
-	{ "ltt-ring-buffer-metadata-client", 1 },
-	{ "ltt-ring-buffer-client-mmap-discard", 1 },
-	{ "ltt-ring-buffer-client-mmap-overwrite", 1 },
-	{ "ltt-ring-buffer-metadata-mmap-client", 1 },
-	{ "lttng-probe-lttng", 1 },
-	{ "lttng-types", 0 },
-	{ "lttng-probe-block", 0 },
-	{ "lttng-probe-irq", 0 },
-	{ "lttng-probe-kvm", 0 },
-	{ "lttng-probe-sched", 0 },
-};
+#include "version.h"
 
 extern const char default_home_dir[],
 	default_tracing_group[],
 	default_ust_sock_dir[],
 	default_global_apps_pipe[];
 
+/* Set in main.c at boot time of the daemon */
+extern int kernel_tracer_fd;
+
 /*
  * This contains extra data needed for processing a command received by the
  * session daemon from the lttng client.
@@ -66,10 +46,10 @@ extern const char default_home_dir[],
 struct command_ctx {
 	int ust_sock;
 	unsigned int lttng_msg_size;
-	struct ucred creds;
 	struct ltt_session *session;
 	struct lttcomm_lttng_msg *llm;
 	struct lttcomm_session_msg *lsm;
+	lttng_sock_cred creds;
 };
 
 struct ust_command {
@@ -87,4 +67,62 @@ struct ust_cmd_queue {
 	struct cds_wfq_queue queue;
 };
 
+/*
+ * This is the wait queue containing wait nodes during the application
+ * registration process.
+ */
+struct ust_reg_wait_queue {
+	unsigned long count;
+	struct cds_list_head head;
+};
+
+/*
+ * Use by the dispatch registration to queue UST command socket to wait for the
+ * notify socket.
+ */
+struct ust_reg_wait_node {
+	struct ust_app *app;
+	struct cds_list_head head;
+};
+
+/*
+ * This pipe is used to inform the thread managing application notify
+ * communication that a command is queued and ready to be processed.
+ */
+extern int apps_cmd_notify_pipe[2];
+
+/*
+ * Used to notify that a hash table needs to be destroyed by dedicated
+ * thread. Required by design because we don't want to move destroy
+ * paths outside of large RCU read-side lock paths, and destroy cannot
+ * be called by call_rcu thread, because it may hang (waiting for
+ * call_rcu completion).
+ */
+extern int ht_cleanup_pipe[2];
+
+/*
+ * Populated when the daemon starts with the current page size of the system.
+ */
+extern long page_size;
+
+/*
+ * Global set once in main(). JUL TCP port for registration.
+ */
+extern unsigned int jul_tcp_port;
+
+/*
+ * Section name to look for in the daemon configuration file.
+ */
+extern const char * const config_section_name;
+
+/* Is this daemon root or not. */
+extern int is_root;
+
+int sessiond_set_thread_pollset(struct lttng_poll_event *events, size_t size);
+int sessiond_check_thread_quit_pipe(int fd, uint32_t events);
+
+void *thread_ht_cleanup(void *data);
+
+void sessiond_notify_ready(void);
+
 #endif /* _LTT_SESSIOND_H */