Revert "ust-event.h: use BYTE_ORDER instead of __BYTE_ORDER"

[lttng-ust.git] / include / lttng / ust-events.h

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 249f42365ce31f90d6132bab4324d4254fbfadb8..2049e53501a95f1ac6ed386f7e3255c060f2b519 100644 (file)
--- 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;
@@ -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 */