Keep event description registry instead of just name callback mapping

[deliverable/lttng-modules.git] / ltt-events.h

diff --git a/ltt-events.h b/ltt-events.h
index e8171b032110138198e4405a30de191b2757912e..344b6fd1e037b2bf73e0f173f975d1ff98646bbc 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -16,6 +16,83 @@ struct ltt_channel;
 struct ltt_session;
 struct lib_ring_buffer_ctx;
 
+/* Type description */
+
+/* Update the astract_types name table in lttng-types.c along with this enum */
+enum abstract_types {
+       atype_integer,
+       atype_enum,
+       atype_array,
+       atype_sequence,
+       atype_string,
+       NR_ABSTRACT_TYPES,
+};
+
+/* Update the string_encodings name table in lttng-types.c along with this enum */
+enum lttng_string_encodings {
+       lttng_encode_UTF8 = 0,
+       lttng_encode_ASCII = 1,
+       NR_STRING_ENCODINGS,
+};
+
+struct lttng_enum_entry {
+       unsigned long long start, end;  /* start and end are inclusive */
+       const char *string;
+};
+
+struct lttng_enum {
+       const struct lttng_enum_entry *entries;
+       unsigned int len;
+};
+
+struct lttng_type {
+       enum abstract_types atype;
+       const char *name;
+       union {
+               struct {
+                       unsigned int size;              /* in bits */
+                       unsigned short alignment;       /* in bits */
+                       unsigned int signedness:1;
+                       unsigned int reverse_byte_order:1;
+               } integer;
+               struct {
+                       const char *parent_type;
+                       const struct lttng_enum def;
+               } enumeration;
+               struct {
+                       const char *elem_type;
+                       unsigned int length;            /* num. elems. */
+               } array;
+               struct {
+                       const char *elem_type;
+                       const char *length_type;
+               } sequence;
+               struct {
+                       enum lttng_string_encodings encoding;
+               } string;
+       } u;
+} __attribute__((packed));
+
+/* Event field description */
+
+struct lttng_event_field {
+       const char *name;
+       const struct lttng_type type;
+};
+
+struct lttng_event_desc {
+       const struct lttng_event_field *fields;
+       const char *name;
+       void *probe_callback;
+       unsigned int nr_fields;
+};
+
+struct lttng_probe_desc {
+       const struct lttng_event_desc *event_desc;
+       unsigned int nr_events;
+       struct list_head head;                  /* chain registered probes */
+};
+
 /*
  * ltt_event structure is referred to by the tracing fast path. It must be
  * kept small.
@@ -23,9 +100,8 @@ struct lib_ring_buffer_ctx;
 struct ltt_event {
        unsigned int id;
        struct ltt_channel *chan;
-       void *probe;
+       const struct lttng_event_desc *desc;
        void *filter;
-       char *name;
        enum instrum_type itype;
        struct list_head list;          /* Event list */
 };
@@ -78,6 +154,12 @@ int ltt_session_stop(struct ltt_session *session);
 void ltt_session_destroy(struct ltt_session *session);
 
 struct ltt_channel *ltt_channel_create(struct ltt_session *session,
+                                      const char *transport_name,
+                                      void *buf_addr,
+                                      size_t subbuf_size, size_t num_subbuf,
+                                      unsigned int switch_timer_interval,
+                                      unsigned int read_timer_interval);
+struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
                                       int overwrite, void *buf_addr,
                                       size_t subbuf_size, size_t num_subbuf,
                                       unsigned int switch_timer_interval,
@@ -87,7 +169,8 @@ void _ltt_channel_destroy(struct ltt_channel *chan);
 struct ltt_event *ltt_event_create(struct ltt_channel *chan,
                                   char *name,
                                   enum instrum_type itype,
-                                  void *probe, void *filter);
+                                  const struct lttng_event_desc *event_desc,
+                                  void *filter);
 int _ltt_event_unregister(struct ltt_event *event);
 void _ltt_event_destroy(struct ltt_event *event);
 
@@ -97,11 +180,9 @@ void ltt_transport_unregister(struct ltt_transport *transport);
 int ltt_debugfs_abi_init(void);
 void ltt_debugfs_abi_exit(void);
 
-int ltt_probe_register(const char *name, void *cb);
-void ltt_probe_unregister(const char *name);
-void *ltt_probe_get(const char *name);
-void ltt_probe_put(void *cb);
-int ltt_probes_init(void);
-void ltt_probes_exit(void);
+int ltt_probe_register(struct lttng_probe_desc *desc);
+void ltt_probe_unregister(struct lttng_probe_desc *desc);
+const struct lttng_event_desc *ltt_event_get(const char *name);
+void ltt_event_put(const struct lttng_event_desc *desc);
 
 #endif /* _LTT_EVENTS_H */