libust 2.0 + ringbuffer + TRACEPOINT_EVENT builds and runs

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

diff --git a/include/ust/lttng-events.h b/include/ust/lttng-events.h
index 743ff161953e1629f13ae0ac525d0e50bdea71a8..5ca156b7c74a81a025673aa6608fd2896c67f838 100644 (file)
--- a/include/ust/lttng-events.h
+++ b/include/ust/lttng-events.h
@@ -15,6 +15,8 @@
 #include <uuid/uuid.h>
 #include <stdint.h>
 #include <ust/lttng-ust-abi.h>
+#include <endian.h>
+#include <float.h>
 
 #undef is_signed_type
 #define is_signed_type(type)           (((type)(-1)) < 0)
@@ -32,6 +34,7 @@ enum abstract_types {
        atype_array,
        atype_sequence,
        atype_string,
+       atype_float,
        NR_ABSTRACT_TYPES,
 };
 
@@ -71,6 +74,33 @@ struct lttng_integer_type {
        enum lttng_string_encodings encoding;
 };
 
+#define _float_mant_dig(_type)                                         \
+       (sizeof(_type) == sizeof(float) ? FLT_MANT_DIG                  \
+               : (sizeof(_type) == sizeof(double) ? DBL_MANT_DIG       \
+               : (sizeof(_type) == sizeof(long double) ? LDBL_MANT_DIG \
+               : 0)))
+
+#define __type_float(_type)                                    \
+       {                                                       \
+           .atype = atype_float,                               \
+           .u.basic._float =                                   \
+               {                                               \
+                 .exp_dig = sizeof(_type) * CHAR_BIT           \
+                               - _float_mant_dig(_type),       \
+                 .mant_dig = _float_mant_dig(_type),           \
+                 .alignment = ltt_alignof(_type) * CHAR_BIT,   \
+                 .signedness = is_signed_type(_type),          \
+                 .reverse_byte_order = __BYTE_ORDER != __FLOAT_WORD_ORDER, \
+               },                                              \
+       }                                                       \
+
+struct lttng_float_type {
+       unsigned int exp_dig;           /* exponent digits, in bits */
+       unsigned int mant_dig;          /* mantissa digits, in bits */
+       unsigned short alignment;       /* in bits */
+       unsigned int reverse_byte_order:1;
+};
+
 union _lttng_basic_type {
        struct lttng_integer_type integer;
        struct {
@@ -79,6 +109,7 @@ union _lttng_basic_type {
        struct {
                enum lttng_string_encodings encoding;
        } string;
+       struct lttng_float_type _float;
 };
 
 struct lttng_basic_type {
@@ -166,15 +197,16 @@ struct ltt_event {
        int metadata_dumped:1;
 };
 
+struct channel;
+
 struct ltt_channel_ops {
-       struct channel *(*channel_create)(const char *name,
+       struct shm_handle *(*channel_create)(const char *name,
                                struct ltt_channel *ltt_chan,
                                void *buf_addr,
                                size_t subbuf_size, size_t num_subbuf,
                                unsigned int switch_timer_interval,
-                               unsigned int read_timer_interval,
-                               int *shmid);
-       void (*channel_destroy)(struct channel *chan);
+                               unsigned int read_timer_interval);
+       void (*channel_destroy)(struct shm_handle *handle);
        struct lib_ring_buffer *(*buffer_read_open)(struct channel *chan);
        void (*buffer_read_close)(struct lib_ring_buffer *buf);
        int (*event_reserve)(struct lib_ring_buffer_ctx *ctx,
@@ -206,7 +238,7 @@ struct ltt_channel {
        struct cds_list_head list;      /* Channel list */
        struct ltt_channel_ops *ops;
        int header_type;                /* 0: unset, 1: compact, 2: large */
-       int shmid;                      /* shared memory ID */
+       struct shm_handle *handle;      /* shared-memory handle */
        int metadata_dumped:1;
 };