X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Fltt-sessiond.h;h=cc6a6ba155ced9e26b6cec7b5f9f4e24a54bb968;hp=e878302115d95ade6040609f64c391beb1630ac4;hb=099e26bda04bd3e02eee5b0a17fc0d7f47e3f8ea;hpb=b73401da87657682c2b51665a6fd1950f5c362f1

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index e87830211..cc6a6ba15 100644
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -3,12 +3,12 @@
  *
  * 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
- * 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
@@ -19,31 +19,41 @@
 #ifndef _LTT_SESSIOND_H
 #define _LTT_SESSIOND_H
 
-#define DEFAULT_HOME_DIR			"/tmp"
-#define DEFAULT_UST_SOCK_DIR		DEFAULT_HOME_DIR "/ust-app-socks"
-#define DEFAULT_GLOBAL_APPS_PIPE	DEFAULT_UST_SOCK_DIR "/global"
+#define _LGPL_SOURCE
+#include <urcu/wfqueue.h>
+
+#include "traceable-app.h"
+
+#define DEFAULT_HOME_DIR            "/tmp"
+#define DEFAULT_UST_SOCK_DIR        DEFAULT_HOME_DIR "/ust-app-socks"
+#define DEFAULT_GLOBAL_APPS_PIPE    DEFAULT_UST_SOCK_DIR "/global"
 #define DEFAULT_TRACE_OUTPUT        DEFAULT_HOME_DIR "/lttng"
 
+struct module_param {
+	const char *name;
+	int required;
+};
+
 /* LTTng kernel tracer modules list */
-const char *kernel_modules_list[] = {
-	"lib-ring-buffer",
-	"ltt-relay",
-	"ltt-ring-buffer-client-discard",
-	"ltt-ring-buffer-client-overwrite",
-	"ltt-ring-buffer-metadata-client",
-	"ltt-ring-buffer-client-mmap-discard",
-	"ltt-ring-buffer-client-mmap-overwrite",
-	"ltt-ring-buffer-metadata-mmap-client",
-	"lttng-ftrace",
-	"lttng-kprobes",
-	"lttng-probe-block",
-	"lttng-probe-irq",
-	"lttng-probe-kvm",
-	"lttng-probe-lttng",
-	"lttng-probe-sched",
-	"lttng-probe-syscalls",
-	"lttng-types",
-	NULL,
+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 },
+	{ "lttng-probe-syscalls", 0 },
 };
 
 extern const char default_home_dir[],
@@ -63,4 +73,19 @@ struct command_ctx {
 	struct lttcomm_session_msg *lsm;
 };
 
+struct ust_command {
+	int sock;
+	struct ust_register_msg reg_msg;
+	struct cds_wfq_node node;
+};
+
+/*
+ * Queue used to enqueue UST registration request (ust_commant) and protected
+ * by a futex with a scheme N wakers / 1 waiters. See futex.c/.h
+ */
+struct ust_cmd_queue {
+	int32_t futex;
+	struct cds_wfq_queue queue;
+};
+
 #endif /* _LTT_SESSIOND_H */