X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=a65bd30a954457ca8ba088244f970bb793f3d10e;hp=9d2b4571a7e04290b1c90af4d7e93827ba912e2e;hb=7c1d2758d663ac5f119eae6849e50b56546a0c48;hpb=561c68970ca461ccf8451aee47efc29da20ad8f1

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 9d2b4571a..a65bd30a9 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -27,9 +27,10 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
-#include "jul.h"
 #include "ust-ctl.h"
 
+struct agent;
+
 struct ltt_ust_ht_key {
 	const char *name;
 	const struct lttng_filter_bytecode *filter;
@@ -49,8 +50,9 @@ struct ltt_ust_event {
 	unsigned int enabled;
 	struct lttng_ust_event attr;
 	struct lttng_ht_node_str node;
+	char *filter_expression;
 	struct lttng_ust_filter_bytecode *filter;
-	const struct lttng_event_exclusion *exclusion;
+	struct lttng_event_exclusion *exclusion;
 };
 
 /* UST channel */
@@ -67,30 +69,31 @@ struct ltt_ust_channel {
 	uint64_t tracefile_count;
 };
 
-/* UST Metadata */
-struct ltt_ust_metadata {
-	int handle;
-	struct lttng_ust_object_data *obj;
-	char pathname[PATH_MAX];              /* Trace file path name */
-	struct lttng_ust_channel_attr attr;
-	struct lttng_ust_object_data *stream_obj;
-};
-
 /* UST domain global (LTTNG_DOMAIN_UST) */
 struct ltt_ust_domain_global {
 	struct lttng_ht *channels;
 	struct cds_list_head registry_buffer_uid_list;
 };
 
+struct ust_pid_tracker_node {
+	struct lttng_ht_node_ulong node;
+};
+
+struct ust_pid_tracker {
+	struct lttng_ht *ht;
+};
+
 /* UST session */
 struct ltt_ust_session {
 	uint64_t id;    /* Unique identifier of session */
-	int start_trace;
 	struct ltt_ust_domain_global domain_global;
-	struct jul_domain domain_jul;
+	/* Hash table of agent indexed by agent domain. */
+	struct lttng_ht *agents;
 	/* UID/GID of the user owning the session */
 	uid_t uid;
 	gid_t gid;
+	/* Is the session active meaning has is been started or stopped. */
+	unsigned int active:1;
 	/*
 	 * Two consumer_output object are needed where one is for the current
 	 * output object and the second one is the temporary object used to store
@@ -116,6 +119,17 @@ struct ltt_ust_session {
 	unsigned int snapshot_mode;
 	unsigned int has_non_default_channel;
 	unsigned int live_timer_interval;	/* usec */
+
+	/* Metadata channel attributes. */
+	struct lttng_ust_channel_attr metadata_attr;
+
+	/*
+	 * Path where to keep the shared memory files.
+	 */
+	char root_shm_path[PATH_MAX];
+	char shm_path[PATH_MAX];
+
+	struct ust_pid_tracker pid_tracker;
 };
 
 /*
@@ -157,9 +171,12 @@ int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node,
  * Lookup functions. NULL is returned if not found.
  */
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
-		char *name, struct lttng_filter_bytecode *filter, int loglevel);
+		char *name, struct lttng_filter_bytecode *filter, int loglevel,
+		struct lttng_event_exclusion *exclusion);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 		char *name);
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+		enum lttng_domain_type domain_type);
 
 /*
  * Create functions malloc() the data structure.
@@ -167,11 +184,13 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 struct ltt_ust_session *trace_ust_create_session(uint64_t session_id);
 struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion);
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path);
 struct ltt_ust_context *trace_ust_create_context(
 		struct lttng_event_context *ctx);
+int trace_ust_match_context(struct ltt_ust_context *uctx,
+		struct lttng_event_context *ctx);
 void trace_ust_delete_channel(struct lttng_ht *ht,
 		struct ltt_ust_channel *channel);
 
@@ -180,10 +199,17 @@ void trace_ust_delete_channel(struct lttng_ht *ht,
  * it's applies.
  */
 void trace_ust_destroy_session(struct ltt_ust_session *session);
-void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata);
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
 void trace_ust_destroy_event(struct ltt_ust_event *event);
 
+int trace_ust_track_pid(struct ltt_ust_session *session, int pid);
+int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid);
+
+int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid);
+
+ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session,
+		int32_t **_pids);
+
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
 static inline int trace_ust_ht_match_event(struct cds_lfht_node *node,
@@ -215,27 +241,17 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr)
 }
 static inline
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+		const char *filter_expression,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion)
 {
 	return NULL;
 }
-static inline
-struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
-{
-	return NULL;
-}
-
 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)
 {
@@ -251,8 +267,15 @@ struct ltt_ust_context *trace_ust_create_context(
 {
 	return NULL;
 }
+static inline
+int trace_ust_match_context(struct ltt_ust_context *uctx,
+		struct lttng_event_context *ctx)
+{
+	return 0;
+}
 static inline struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
-		char *name, struct lttng_filter_bytecode *filter, int loglevel)
+		char *name, struct lttng_filter_bytecode *filter, int loglevel,
+		struct lttng_event_exclusion *exclusion)
 {
 	return NULL;
 }
@@ -262,7 +285,33 @@ void trace_ust_delete_channel(struct lttng_ht *ht,
 {
 	return;
 }
-
+static inline
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+		enum lttng_domain_type domain_type)
+{
+	return NULL;
+}
+static inline
+int trace_ust_track_pid(struct ltt_ust_session *session, int pid)
+{
+	return 0;
+}
+static inline
+int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
+{
+	return 0;
+}
+static inline
+int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid)
+{
+	return 0;
+}
+static inline
+ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session,
+		int32_t **_pids)
+{
+	return -1;
+}
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTT_TRACE_UST_H */