Fix UST renaming and update ust headers

[lttng-tools.git] / ltt-sessiond / ltt-sessiond.h

diff --git a/ltt-sessiond/ltt-sessiond.h b/ltt-sessiond/ltt-sessiond.h
index 2b09a06baab9eb6cdc05be21b2bda0d2cfa85b43..63de2e12076ac3509f049062b2d7bfd60786d9b1 100644 (file)
--- a/ltt-sessiond/ltt-sessiond.h
+++ b/ltt-sessiond/ltt-sessiond.h
@@ -19,11 +19,20 @@
 #ifndef _LTT_SESSIOND_H
 #define _LTT_SESSIOND_H
 
+#define _LGPL_SOURCE
+#include <urcu.h>
+#include <urcu/wfqueue.h>
+
+#include "ust-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;
        int required;
@@ -48,7 +57,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 +76,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 */