X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=b1b200f1d188d6e20b4c28c006bc178467cd5e9a;hb=e8fcabef14e1e2ce8d159c68c5585931df1216b4;hp=f2f8c7e3654bfe3be456d1e32e3a711bf48c3d7d;hpb=d28f6a948209434945e785f2ad3b89aaa67897e4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index f2f8c7e36..b1b200f1d 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,14 +50,27 @@ struct ltt_ust_event {
 	unsigned int enabled;
 	struct lttng_ust_event attr;
 	struct lttng_ht_node_str node;
-	struct lttng_ust_filter_bytecode *filter;
-	const struct lttng_event_exclusion *exclusion;
+	char *filter_expression;
+	struct lttng_filter_bytecode *filter;
+	struct lttng_event_exclusion *exclusion;
+	/*
+	 * An internal event is an event which was created by the session daemon
+	 * through which, for example, events emitted in Agent domains are
+	 * "funelled". This is used to hide internal events from external
+	 * clients as they should never be modified by the external world.
+	 */
+	bool internal;
 };
 
 /* UST channel */
 struct ltt_ust_channel {
 	uint64_t id;	/* unique id per session. */
 	unsigned int enabled;
+	/*
+	 * A UST channel can be part of a userspace sub-domain such as JUL,
+	 * Log4j, Python.
+	 */
+	enum lttng_domain_type domain;
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	struct lttng_ust_channel_attr attr;
 	struct lttng_ht *ctx;
@@ -73,15 +87,25 @@ struct ltt_ust_domain_global {
 	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
@@ -107,6 +131,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;
 };
 
 /*
@@ -152,17 +187,24 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 		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.
  */
 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_channel *trace_ust_create_channel(struct lttng_channel *attr,
+		enum lttng_domain_type domain);
 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 lttng_event_exclusion *exclusion,
+		bool internal_event);
 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);
 
@@ -174,6 +216,14 @@ void trace_ust_destroy_session(struct ltt_ust_session *session);
 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,
@@ -199,14 +249,17 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
 	return NULL;
 }
 static inline
-struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr)
+struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
+		enum lttng_domain_type domain)
 {
 	return NULL;
 }
 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)
+		struct lttng_event_exclusion *exclusion,
+		bool internal_event)
 {
 	return NULL;
 }
@@ -230,6 +283,12 @@ 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,
 		struct lttng_event_exclusion *exclusion)
@@ -242,7 +301,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 */