X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=53e1ab2b5b2a98836ff520e7bf025426c909f74b;hp=a06c471cce9a6c10a7673f10e86ab1d55da31eb7;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index a06c471cc..53e1ab2b5 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -12,9 +12,10 @@
 #include <limits.h>
 #include <urcu/list.h>
 
-#include <lttng/lttng.h>
-#include <common/hashtable/hashtable.h>
 #include <common/defaults.h>
+#include <common/hashtable/hashtable.h>
+#include <common/tracker.h>
+#include <lttng/lttng.h>
 
 #include "consumer.h"
 #include "lttng-ust-ctl.h"
@@ -23,7 +24,7 @@ struct agent;
 
 struct ltt_ust_ht_key {
 	const char *name;
-	const struct lttng_filter_bytecode *filter;
+	const struct lttng_bytecode *filter;
 	enum lttng_ust_loglevel_type loglevel_type;
 	int loglevel_value;
 	const struct lttng_event_exclusion *exclusion;
@@ -42,7 +43,7 @@ struct ltt_ust_event {
 	struct lttng_ust_event attr;
 	struct lttng_ht_node_str node;
 	char *filter_expression;
-	struct lttng_filter_bytecode *filter;
+	struct lttng_bytecode *filter;
 	struct lttng_event_exclusion *exclusion;
 	/*
 	 * An internal event is an event which was created by the session daemon
@@ -137,9 +138,9 @@ struct ltt_ust_session {
 	struct ust_id_tracker vgid_tracker;
 
 	/* Tracker list of keys requested by users. */
-	struct lttng_tracker_list *tracker_list_vpid;
-	struct lttng_tracker_list *tracker_list_vuid;
-	struct lttng_tracker_list *tracker_list_vgid;
+	struct process_attr_tracker *tracker_vpid;
+	struct process_attr_tracker *tracker_vuid;
+	struct process_attr_tracker *tracker_vgid;
 };
 
 /*
@@ -181,7 +182,7 @@ 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,
+		char *name, struct lttng_bytecode *filter,
 		enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
 		struct lttng_event_exclusion *exclusion);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
@@ -197,7 +198,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
 		enum lttng_domain_type domain);
 enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
 		char *filter_expression,
-		struct lttng_filter_bytecode *filter,
+		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
 		bool internal_event, struct ltt_ust_event **ust_event);
 struct ltt_ust_context *trace_ust_create_context(
@@ -217,20 +218,24 @@ void trace_ust_destroy_event(struct ltt_ust_event *event);
 void trace_ust_destroy_context(struct ltt_ust_context *ctx);
 void trace_ust_free_session(struct ltt_ust_session *session);
 
-int trace_ust_track_id(enum lttng_tracker_type tracker_type,
+int trace_ust_id_tracker_lookup(enum lttng_process_attr process_attr,
 		struct ltt_ust_session *session,
-		const struct lttng_tracker_id *id);
-int trace_ust_untrack_id(enum lttng_tracker_type tracker_type,
+		int id);
+enum lttng_error_code trace_ust_process_attr_tracker_set_tracking_policy(
 		struct ltt_ust_session *session,
-		const struct lttng_tracker_id *id);
-
-int trace_ust_id_tracker_lookup(enum lttng_tracker_type tracker_type,
+		enum lttng_process_attr process_attr,
+		enum lttng_tracking_policy policy);
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_add_value(
 		struct ltt_ust_session *session,
-		int id);
-
-int trace_ust_list_tracker_ids(enum lttng_tracker_type tracker_type,
+		enum lttng_process_attr process_attr,
+		const struct process_attr_value *value);
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_remove_value(
+		struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr,
+		const struct process_attr_value *value);
+const struct process_attr_tracker *trace_ust_get_process_attr_tracker(
 		struct ltt_ust_session *session,
-		struct lttng_tracker_ids **_ids);
+		enum lttng_process_attr process_attr);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -265,7 +270,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
 static inline
 enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
 		const char *filter_expression,
-		struct lttng_filter_bytecode *filter,
+		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
 		bool internal_event, struct ltt_ust_event **ust_event)
 {
@@ -305,7 +310,7 @@ int trace_ust_match_context(const struct ltt_ust_context *uctx,
 }
 static inline
 struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
-		char *name, struct lttng_filter_bytecode *filter,
+		char *name, struct lttng_bytecode *filter,
 		enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
 		struct lttng_event_exclusion *exclusion)
 {
@@ -323,32 +328,44 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
 {
 	return NULL;
 }
-static inline int trace_ust_track_id(enum lttng_tracker_type tracker_type,
+static inline int trace_ust_id_tracker_lookup(
+		enum lttng_process_attr process_attr,
 		struct ltt_ust_session *session,
-		const struct lttng_tracker_id *id)
+		int id)
 {
 	return 0;
 }
-static inline int trace_ust_untrack_id(enum lttng_tracker_type tracker_type,
+static inline enum lttng_error_code
+trace_ust_process_attr_tracker_set_tracking_policy(
 		struct ltt_ust_session *session,
-		const struct lttng_tracker_id *id)
+		enum lttng_process_attr process_attr,
+		enum lttng_tracking_policy policy)
 {
-	return 0;
+	return LTTNG_OK;
 }
-static inline int trace_ust_id_tracker_lookup(
-		enum lttng_tracker_type tracker_type,
+static inline enum lttng_error_code
+trace_ust_process_attr_tracker_inclusion_set_add_value(
 		struct ltt_ust_session *session,
-		int pid)
+		enum lttng_process_attr process_attr,
+		const struct process_attr_value *value)
 {
-	return 0;
+	return LTTNG_OK;
 }
-static inline int trace_ust_list_tracker_ids(
-		enum lttng_tracker_type tracker_type,
+static inline enum lttng_error_code
+trace_ust_process_attr_tracker_inclusion_set_remove_value(
 		struct ltt_ust_session *session,
-		struct lttng_tracker_ids **_ids)
+		enum lttng_process_attr process_attr,
+		const struct process_attr_value *value)
 {
-	return -1;
+	return LTTNG_OK;
 }
+static inline const struct process_attr_tracker *
+trace_ust_get_process_attr_tracker(struct ltt_ust_session *session,
+		enum lttng_process_attr process_attr)
+{
+	return NULL;
+}
+
 #endif /* HAVE_LIBLTTNG_UST_CTL */
 
 #endif /* _LTT_TRACE_UST_H */