X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=b254ad05df64db52dc88b6d1e07f46fc3f3e3104;hp=53e1ab2b5b2a98836ff520e7bf025426c909f74b;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hpb=11f6ce94d8fb73f017888681aaba5d7df55fc735

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 53e1ab2b5..b254ad05d 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -23,11 +23,13 @@
 struct agent;
 
 struct ltt_ust_ht_key {
+	uint64_t tracer_token;
 	const char *name;
 	const struct lttng_bytecode *filter;
 	enum lttng_ust_loglevel_type loglevel_type;
 	int loglevel_value;
 	const struct lttng_event_exclusion *exclusion;
+	struct lttng_map_key *key;
 };
 
 /* Context hash table nodes */
@@ -45,6 +47,9 @@ struct ltt_ust_event {
 	char *filter_expression;
 	struct lttng_bytecode *filter;
 	struct lttng_event_exclusion *exclusion;
+
+	/* refcounted */
+	struct lttng_map_key *key;
 	/*
 	 * An internal event is an event which was created by the session daemon
 	 * through which, for example, events emitted in Agent domains are
@@ -76,9 +81,31 @@ struct ltt_ust_channel {
 	uint64_t monitor_timer_interval;
 };
 
+struct ltt_ust_map_dead_pid_kv_values {
+	pthread_mutex_t lock;
+	struct lttng_ht *dead_app_kv_values_32bits;
+	struct lttng_ht *dead_app_kv_values_64bits;
+};
+
+/* UST map */
+struct ltt_ust_map {
+	uint64_t id;	/* unique id per session. */
+	char name[LTTNG_UST_SYM_NAME_LEN];
+	unsigned int enabled;
+	size_t bucket_count;
+	bool coalesce_hits;
+	enum lttng_map_bitness bitness;
+	uint64_t nr_cpu;
+	struct lttng_ht_node_str node;
+	struct lttng_map *map;
+	struct lttng_ht *events;
+	struct ltt_ust_map_dead_pid_kv_values dead_app_kv_values;
+};
+
 /* UST domain global (LTTNG_DOMAIN_UST) */
 struct ltt_ust_domain_global {
 	struct lttng_ht *channels;
+	struct lttng_ht *maps;
 	struct cds_list_head registry_buffer_uid_list;
 };
 
@@ -182,11 +209,14 @@ 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_bytecode *filter,
+		uint64_t tracer_token, char *name, struct lttng_bytecode *filter,
 		enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
-		struct lttng_event_exclusion *exclusion);
+		struct lttng_event_exclusion *exclusion,
+		struct lttng_map_key *key);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 		const char *name);
+struct ltt_ust_map *trace_ust_find_map_by_name(struct lttng_ht *ht,
+		const char *name);
 struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
 		enum lttng_domain_type domain_type);
 
@@ -196,17 +226,26 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
 struct ltt_ust_session *trace_ust_create_session(uint64_t session_id);
 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,
+struct ltt_ust_map *trace_ust_create_map(const struct lttng_map *map);
+enum lttng_error_code trace_ust_create_event(uint64_t tracer_token,
+		const char *ev_name,
+		struct lttng_map_key *key,
+		enum lttng_event_type ev_type,
+		enum lttng_loglevel_type ev_loglevel_type,
+		enum lttng_loglevel ev_loglevel,
 		char *filter_expression,
 		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
-		bool internal_event, struct ltt_ust_event **ust_event);
+		bool internal_event,
+		struct ltt_ust_event **ust_event);
 struct ltt_ust_context *trace_ust_create_context(
 		const struct lttng_event_context *ctx);
 int trace_ust_match_context(const struct ltt_ust_context *uctx,
 		const struct lttng_event_context *ctx);
 void trace_ust_delete_channel(struct lttng_ht *ht,
 		struct ltt_ust_channel *channel);
+void trace_ust_delete_map(struct lttng_ht *ht,
+		struct ltt_ust_map *map);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if
@@ -214,6 +253,7 @@ void trace_ust_delete_channel(struct lttng_ht *ht,
  */
 void trace_ust_destroy_session(struct ltt_ust_session *session);
 void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
+void trace_ust_destroy_map(struct ltt_ust_map *map);
 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);
@@ -255,7 +295,12 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 {
 	return NULL;
 }
-
+static inline
+struct ltt_ust_map *trace_ust_find_map_by_name(struct lttng_ht *ht,
+		const char *name)
+{
+	return NULL;
+}
 static inline
 struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
 {
@@ -268,11 +313,22 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
 	return NULL;
 }
 static inline
-enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
-		const char *filter_expression,
+struct ltt_ust_map *trace_ust_create_map(const struct lttng_map *map)
+{
+	return NULL;
+}
+static inline
+enum lttng_error_code trace_ust_create_event(uint64_t tracer_token,
+		const char *ev_name,
+		struct lttng_map_key *key,
+		enum lttng_event_type ev_type,
+		enum lttng_loglevel_type ev_loglevel_type,
+		enum lttng_loglevel ev_loglevel,
+		char *filter_expression,
 		struct lttng_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
-		bool internal_event, struct ltt_ust_event **ust_event)
+		bool internal_event,
+		struct ltt_ust_event **ust_event)
 {
 	return LTTNG_ERR_NO_UST;
 }
@@ -286,6 +342,11 @@ void trace_ust_destroy_channel(struct ltt_ust_channel *channel)
 {
 }
 
+static inline
+void trace_ust_destroy_map(struct ltt_ust_map *map)
+{
+}
+
 static inline
 void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
@@ -310,9 +371,10 @@ 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_bytecode *filter,
+		uint64_t tracer_token, char *name, struct lttng_bytecode *filter,
 		enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
-		struct lttng_event_exclusion *exclusion)
+		struct lttng_event_exclusion *exclusion,
+		struct lttng_map_key *key)
 {
 	return NULL;
 }