X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=476ddd7845a5ea264bf0b837ad37aaa91ad66d86;hb=8d1d746f7042216d04c842e09bd6c3b2643d2309;hp=249f42365ce31f90d6132bab4324d4254fbfadb8;hpb=51c5df09105025dc696ac5c89a819b73cc52b687;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 249f4236..476ddd78 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -20,13 +20,14 @@
 
 #include <urcu/list.h>
 #include <urcu/hlist.h>
-#include <uuid/uuid.h>
 #include <stdint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-tracer.h>
-#include <endian.h>
+#include <lttng/ust-endian.h>
 #include <float.h>
 
+#define LTTNG_UST_UUID_LEN		16
+
 struct ltt_channel;
 struct ltt_session;
 struct lttng_ust_lib_ring_buffer_ctx;
@@ -76,7 +77,7 @@ struct lttng_enum_entry {
 		  .size = sizeof(_type) * CHAR_BIT,		\
 		  .alignment = lttng_alignof(_type) * CHAR_BIT,	\
 		  .signedness = lttng_is_signed_type(_type),	\
-		  .reverse_byte_order = _byte_order != __BYTE_ORDER,	\
+		  .reverse_byte_order = _byte_order != BYTE_ORDER,	\
 		  .base = _base,				\
 		  .encoding = lttng_encode_##_encoding,		\
 		},						\
@@ -184,11 +185,6 @@ struct lttng_ctx {
 	unsigned int allocated_fields;
 };
 
-struct tracepoint_loglevel_entry  {
-	const char *identifier;
-	long value;
-};
-
 /*
  * Entry describing a per-session active wildcard, along with the event
  * attribute and channel information configuring the events that need to
@@ -213,6 +209,8 @@ struct wildcard_entry {
 	struct cds_list_head list;
 	/* head of session list to which this wildcard apply */
 	struct cds_list_head session_list;
+	enum lttng_ust_loglevel_type loglevel_type;
+	int loglevel;
 	char name[0];
 };
 
@@ -222,15 +220,13 @@ struct lttng_event_desc {
 	const struct lttng_event_ctx *ctx;	/* context */
 	const struct lttng_event_field *fields;	/* event payload */
 	unsigned int nr_fields;
-	const struct tracepoint_loglevel_entry **loglevel;
+	const int **loglevel;
 };
 
 struct lttng_probe_desc {
 	const char *provider;
 	const struct lttng_event_desc **event_desc;
 	unsigned int nr_events;
-	const struct tracepoint_loglevel_entry **loglevels;
-	unsigned int nr_loglevels;
 	struct cds_list_head head;		/* chain registered probes */
 };
 
@@ -249,9 +245,6 @@ struct ust_pending_probe;
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
  * kept small.
- * Note about loglevel_list: this list is only used to enable/disable
- * events on a per-loglevel basis. The events created internally by the
- * loglevel are only freed when the session is destroyed.
  */
 struct ltt_event {
 	unsigned int id;
@@ -331,7 +324,7 @@ struct ltt_channel {
 	/* Channel ID, available for consumer too */
 	unsigned int id;
 	/* Copy of session UUID for consumer (availability through shm) */
-	uuid_t uuid;			/* Trace session unique ID */
+	unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
 };
 
 struct ltt_session {
@@ -344,7 +337,7 @@ struct ltt_session {
 	struct cds_list_head wildcards;	/* Wildcard list head */
 	struct cds_list_head list;	/* Session list */
 	unsigned int free_chan_id;	/* Next chan ID to allocate */
-	uuid_t uuid;			/* Trace session unique ID */
+	unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
 	unsigned int metadata_dumped:1;
 };
 
@@ -421,15 +414,15 @@ void ltt_probes_prune_event_list(struct lttng_ust_tracepoint_list *list);
 struct lttng_ust_tracepoint_iter *
 	lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
 
-struct wildcard_entry *match_wildcard(const char *name);
-struct session_wildcard *add_wildcard(const char *name,
-	struct ltt_channel *chan,
-	struct lttng_ust_event *event_param);
-void _remove_wildcard(struct session_wildcard *wildcard);
 int ltt_wildcard_enable(struct session_wildcard *wildcard);
 int ltt_wildcard_disable(struct session_wildcard *wildcard);
 int ltt_wildcard_create(struct ltt_channel *chan,
 	struct lttng_ust_event *event_param,
 	struct session_wildcard **sl);
+int ltt_loglevel_match(const struct lttng_event_desc *desc,
+		enum lttng_ust_loglevel_type req_type,
+		int req_loglevel);
+void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
+				struct session_wildcard *wildcard);
 
 #endif /* _LTTNG_UST_EVENTS_H */