X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ltt-sessiond%2Fltt-sessiond.h;h=617ca54c40ae61a72bf9dfe1a7c4e84582a70817;hb=a54bd42d73836eb9033a31c3f68be5b7e8612dce;hp=febc4eb121c23ecf67422345b87b7d92212e0eab;hpb=d2abc4ee14cc1bb86ffa6cd024f18a671de8a32c;p=lttng-tools.git

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index febc4eb12..617ca54c4 100644
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -8,7 +8,7 @@
  *
  * 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,10 +19,18 @@
 #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 DEFAULT_TRACE_OUTPUT        	DEFAULT_HOME_DIR "/lttng"
+#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"
+
+#define DEFAULT_GLOBAL_APPS_WAIT_SHM_PATH   "/lttng-ust-apps-wait"
+#define DEFAULT_HOME_APPS_WAIT_SHM_PATH     "/lttng-ust-apps-wait-%u"
 
 struct module_param {
 	const char *name;
@@ -31,11 +39,11 @@ struct module_param {
 
 /* LTTng kernel tracer modules list */
 const struct module_param kernel_modules_list[] = {
-	{ "ltt-relay", 1 },
 	{ "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 },
@@ -48,7 +56,6 @@ const struct module_param kernel_modules_list[] = {
 	{ "lttng-probe-irq", 0 },
 	{ "lttng-probe-kvm", 0 },
 	{ "lttng-probe-sched", 0 },
-	{ "lttng-probe-syscalls", 0 },
 };
 
 extern const char default_home_dir[],
@@ -68,4 +75,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 */