X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Ftrace-ust.h;h=518eafbe67a06b4950a93c195ff5a3e653355f9e;hp=abbf9a9d191a8498f1e714e4435fa4df50acda56;hb=48842b309b2000205367409c0f29ca40ec3e251c;hpb=3bd1e0819b577ffcb44acd7c2f8e02ff09654b7b

diff --git a/ltt-sessiond/trace-ust.h b/ltt-sessiond/trace-ust.h
index abbf9a9d1..518eafbe6 100644
--- a/ltt-sessiond/trace-ust.h
+++ b/ltt-sessiond/trace-ust.h
@@ -21,79 +21,93 @@
 
 #include <config.h>
 #include <limits.h>
+#include <urcu.h>
 #include <urcu/list.h>
 #include <lttng/lttng.h>
 
-/*
- * FIXME: temporary workaround: we use a lttng-tools local version of
- * lttng-ust-abi.h if UST is not found. Eventually, we should use our
- * own internal structures within lttng-tools instead of relying on the
- * UST ABI.
- */
-#ifdef CONFIG_CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-abi.h>
-#else
-#include "lttng-ust-abi.h"
-#endif
+#include "ust-ctl.h"
 
-/*
- * UST session list.
- */
-struct ltt_ust_session_list {
-	unsigned int count;
-	struct cds_list_head head;
-};
+#include "../hashtable/rculfhash.h"
 
-/* UST event list */
-struct ltt_ust_event_list {
+/* UST Stream list */
+struct ltt_ust_stream_list {
 	unsigned int count;
 	struct cds_list_head head;
 };
 
-/* UST Channel list */
-struct ltt_ust_channel_list {
-	unsigned int count;
-	struct cds_list_head head;
+/* Context hash table nodes */
+struct ltt_ust_context {
+	struct lttng_ust_context ctx;
+	struct cds_lfht_node node;
 };
 
 /* UST event */
 struct ltt_ust_event {
-	int handle;
-	int enabled;
-	struct lttng_ust_context ctx;
 	struct lttng_ust_event attr;
-	struct cds_list_head list;
+	struct cds_lfht *ctx;
+	struct cds_lfht_node node;
+};
+
+/* UST stream */
+struct ltt_ust_stream {
+	int handle;
+	char pathname[PATH_MAX];
+	struct object_data *obj;
+	struct cds_lfht_node node;
 };
 
 /* UST channel */
 struct ltt_ust_channel {
-	int handle;
-	int enabled;
 	char name[LTTNG_UST_SYM_NAME_LEN];
-	char trace_path[PATH_MAX];    /* Trace file path name */
-	struct lttng_ust_context ctx;
+	char pathname[PATH_MAX];
 	struct lttng_ust_channel attr;
-	struct ltt_ust_event_list events;
-	struct cds_list_head list;
+	struct cds_lfht *ctx;
+	struct cds_lfht *events;
+	struct cds_lfht_node node;
 };
 
 /* UST Metadata */
 struct ltt_ust_metadata {
 	int handle;
-	char *trace_path;             /* Trace file path name */
+	struct object_data *obj;
+	char pathname[PATH_MAX];              /* Trace file path name */
 	struct lttng_ust_channel attr;
+	struct object_data *stream_obj;
+};
+
+/* UST domain global (LTTNG_DOMAIN_UST) */
+struct ltt_ust_domain_global {
+	struct cds_lfht *channels;
+};
+
+/* UST domain pid (LTTNG_DOMAIN_UST_PID) */
+struct ltt_ust_domain_pid {
+	pid_t pid;
+	struct cds_lfht *channels;
+	struct cds_lfht_node node;
+};
+
+/* UST domain exec name (LTTNG_DOMAIN_UST_EXEC_NAME) */
+struct ltt_ust_domain_exec {
+	char exec_name[LTTNG_UST_SYM_NAME_LEN];
+	struct cds_lfht *channels;
+	struct cds_lfht_node node;
 };
 
 /* UST session */
 struct ltt_ust_session {
-	int handle;
-	int enabled;
+	int uid;   /* Unique identifier of session */
 	int consumer_fds_sent;
-	char path[PATH_MAX];
-	struct lttng_domain domain;
-	struct ltt_ust_metadata *metadata;
-	struct ltt_ust_channel_list channels;
-	struct cds_list_head list;
+	int consumer_fd;
+	char pathname[PATH_MAX];
+	struct ltt_ust_domain_global domain_global;
+	/*
+	 * Those two hash tables contains data for a specific UST domain and each
+	 * contains a HT of channels. See ltt_ust_domain_exec and
+	 * ltt_ust_domain_pid data structures.
+	 */
+	struct cds_lfht *domain_pid;
+	struct cds_lfht *domain_exec;
 };
 
 #ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
@@ -101,17 +115,15 @@ struct ltt_ust_session {
 /*
  * Lookup functions. NULL is returned if not found.
  */
-struct ltt_ust_event *trace_ust_get_event_by_name(
-		char *name, struct ltt_ust_channel *channel);
-struct ltt_ust_channel *trace_ust_get_channel_by_name(
-		char *name, struct ltt_ust_session *session);
-struct ltt_ust_session *trace_ust_get_session_by_pid(
-		struct ltt_ust_session_list *session_list, pid_t pid);
+struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht,
+		char *name);
+struct ltt_ust_channel *trace_ust_find_channel_by_name(struct cds_lfht *ht,
+		char *name);
 
 /*
  * Create functions malloc() the data structure.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path, pid_t pid,
+struct ltt_ust_session *trace_ust_create_session(char *path, unsigned int uid,
 		struct lttng_domain *domain);
 struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
 		char *path);
@@ -130,20 +142,15 @@ void trace_ust_destroy_event(struct ltt_ust_event *event);
 #else
 
 static inline
-struct ltt_ust_event *trace_ust_get_event_by_name(
-		char *name, struct ltt_ust_channel *channel)
-{
-	return NULL;
-}
-static inline
-struct ltt_ust_channel *trace_ust_get_channel_by_name(
-		char *name, struct ltt_ust_session *session)
+struct ltt_ust_event *trace_ust_find_event_by_name(struct cds_lfht *ht,
+		char *name)
 {
 	return NULL;
 }
+
 static inline
-struct ltt_ust_session *trace_ust_get_session_by_pid(
-		struct ltt_ust_session_list *session_list, pid_t pid)
+struct ltt_ust_channel *trace_ust_find_channel_by_name(struct cds_lfht *ht,
+		char *name)
 {
 	return NULL;
 }
@@ -175,19 +182,22 @@ static inline
 void trace_ust_destroy_session(struct ltt_ust_session *session)
 {
 }
+
 static inline
 void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
 {
 }
+
 static inline
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 {
 }
+
 static inline
 void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
 }
 
-#endif
+#endif /* CONFIG_CONFIG_LTTNG_TOOLS_HAVE_UST */
 
 #endif /* _LTT_TRACE_UST_H */