Fix: context alignment not properly handled
[lttng-ust.git] / include / lttng / ust-events.h
index 749478a6a335b3b9b14ab0ceb3dd87787f469b30..9a46e678ad782afaaf13a3b97df3a0adf1ed5f89 100644 (file)
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <stdint.h>
+#include <lttng/ust-config.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-tracer.h>
 #include <lttng/ust-endian.h>
 #include <float.h>
+#include <errno.h>
+#include <urcu/ref.h>
+#include <pthread.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define LTTNG_UST_UUID_LEN             16
 
+/*
+ * Tracepoint provider version. Compatibility based on the major number.
+ * Older tracepoint providers can always register to newer lttng-ust
+ * library, but the opposite is rejected: a newer tracepoint provider is
+ * rejected by an older lttng-ust library.
+ */
+#define LTTNG_UST_PROVIDER_MAJOR       1
+#define LTTNG_UST_PROVIDER_MINOR       0
+
 struct lttng_channel;
 struct lttng_session;
 struct lttng_ust_lib_ring_buffer_ctx;
@@ -89,15 +106,21 @@ struct lttng_enum_entry {
 
 #define __type_integer(_type, _byte_order, _base, _encoding)   \
        {                                                       \
-           .atype = atype_integer,                             \
-           .u.basic.integer =                                  \
+         .atype = atype_integer,                               \
+         .u =                                                  \
                {                                               \
-                 .size = sizeof(_type) * CHAR_BIT,             \
-                 .alignment = lttng_alignof(_type) * CHAR_BIT, \
-                 .signedness = lttng_is_signed_type(_type),    \
-                 .reverse_byte_order = _byte_order != BYTE_ORDER,      \
-                 .base = _base,                                \
-                 .encoding = lttng_encode_##_encoding,         \
+                 .basic =                                      \
+                       {                                       \
+                         .integer =                            \
+                               {                               \
+                                 .size = sizeof(_type) * CHAR_BIT,             \
+                                 .alignment = lttng_alignof(_type) * CHAR_BIT, \
+                                 .signedness = lttng_is_signed_type(_type),    \
+                                 .reverse_byte_order = _byte_order != BYTE_ORDER, \
+                                 .base = _base,                                \
+                                 .encoding = lttng_encode_##_encoding,         \
+                               }                               \
+                       }                                       \
                },                                              \
        }                                                       \
 
@@ -123,14 +146,20 @@ struct lttng_integer_type {
 
 #define __type_float(_type)                                    \
        {                                                       \
-           .atype = atype_float,                               \
-           .u.basic._float =                                   \
+         .atype = atype_float,                                 \
+         .u =                                                  \
                {                                               \
-                 .exp_dig = sizeof(_type) * CHAR_BIT           \
-                               - _float_mant_dig(_type),       \
-                 .mant_dig = _float_mant_dig(_type),           \
-                 .alignment = lttng_alignof(_type) * CHAR_BIT, \
-                 .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \
+                 .basic =                                      \
+                       {                                       \
+                         ._float =                             \
+                               {                               \
+                                 .exp_dig = sizeof(_type) * CHAR_BIT           \
+                                                 - _float_mant_dig(_type),     \
+                                 .mant_dig = _float_mant_dig(_type),           \
+                                 .alignment = lttng_alignof(_type) * CHAR_BIT, \
+                                 .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER, \
+                               }                               \
+                       }                                       \
                },                                              \
        }                                                       \
 
@@ -211,6 +240,8 @@ union lttng_ctx_value {
        double d;
 };
 
+struct lttng_perf_counter_field;
+
 #define LTTNG_UST_CTX_FIELD_PADDING    40
 struct lttng_ctx_field {
        struct lttng_event_field event_field;
@@ -221,16 +252,18 @@ struct lttng_ctx_field {
        void (*get_value)(struct lttng_ctx_field *field,
                         union lttng_ctx_value *value);
        union {
+               struct lttng_perf_counter_field *perf_counter;
                char padding[LTTNG_UST_CTX_FIELD_PADDING];
        } u;
        void (*destroy)(struct lttng_ctx_field *field);
 };
 
-#define LTTNG_UST_CTX_PADDING  24
+#define LTTNG_UST_CTX_PADDING  20
 struct lttng_ctx {
        struct lttng_ctx_field *fields;
        unsigned int nr_fields;
        unsigned int allocated_fields;
+       unsigned int largest_align;
        char padding[LTTNG_UST_CTX_PADDING];
 };
 
@@ -251,7 +284,7 @@ struct lttng_event_desc {
        } u;
 };
 
-#define LTTNG_UST_PROBE_DESC_PADDING   20
+#define LTTNG_UST_PROBE_DESC_PADDING   12
 struct lttng_probe_desc {
        const char *provider;
        const struct lttng_event_desc **event_desc;
@@ -259,6 +292,8 @@ struct lttng_probe_desc {
        struct cds_list_head head;              /* chain registered probes */
        struct cds_list_head lazy_init_head;
        int lazy;                               /* lazy registration */
+       uint32_t major;
+       uint32_t minor;
        char padding[LTTNG_UST_PROBE_DESC_PADDING];
 };
 
@@ -278,6 +313,8 @@ struct lttng_enabler {
 
        /* head list of struct lttng_ust_filter_bytecode_node */
        struct cds_list_head filter_bytecode_head;
+       /* head list of struct lttng_ust_excluder_node */
+       struct cds_list_head excluder_head;
        struct cds_list_head node;      /* per-session list of enablers */
 
        struct lttng_ust_event event_param;
@@ -319,6 +356,15 @@ struct lttng_ust_filter_bytecode_node {
        struct lttng_ust_filter_bytecode bc;
 };
 
+struct lttng_ust_excluder_node {
+       struct cds_list_head node;
+       struct lttng_enabler *enabler;
+       /*
+        * struct lttng_ust_event_exclusion had variable sized array,
+        * must be last field.
+        */
+       struct lttng_ust_event_exclusion excluder;
+};
 /*
  * Filter return value masks.
  */
@@ -395,7 +441,10 @@ struct lttng_channel_ops {
                        unsigned char *uuid,
                        uint32_t chan_id);
        void (*channel_destroy)(struct lttng_channel *chan);
-       void *_deprecated1;
+       union {
+               void *_deprecated1;
+               unsigned long has_strcpy:1;             /* ABI has strcpy */
+       } u;
        void *_deprecated2;
        int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                             uint32_t event_id);
@@ -414,6 +463,8 @@ struct lttng_channel_ops {
        int (*is_finalized)(struct channel *chan);
        int (*is_disabled)(struct channel *chan);
        int (*flush_buffer)(struct channel *chan, struct lttng_ust_shm_handle *handle);
+       void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+                       const char *src, size_t len);
 };
 
 /*
@@ -479,6 +530,9 @@ struct lttng_session {
        struct lttng_ust_event_ht events_ht;    /* ht of events */
        void *owner;                            /* object owner */
        int tstate:1;                           /* Transient enable state */
+
+       /* New UST 2.4 */
+       int statedump_pending:1;
 };
 
 struct lttng_transport {
@@ -515,12 +569,14 @@ int lttng_enabler_attach_bytecode(struct lttng_enabler *enabler,
                struct lttng_ust_filter_bytecode_node *bytecode);
 int lttng_enabler_attach_context(struct lttng_enabler *enabler,
                struct lttng_ust_context *ctx);
+int lttng_enabler_attach_exclusion(struct lttng_enabler *enabler,
+               struct lttng_ust_excluder_node *excluder);
 
 int lttng_attach_context(struct lttng_ust_context *context_param,
                struct lttng_ctx **ctx, struct lttng_session *session);
 void lttng_context_init(void);
 void lttng_context_exit(void);
-struct lttng_ctx *lttng_static_ctx;    /* Used by filtering */
+extern struct lttng_ctx *lttng_static_ctx;     /* Used by filtering */
 
 void lttng_transport_register(struct lttng_transport *transport);
 void lttng_transport_unregister(struct lttng_transport *transport);
@@ -535,6 +591,7 @@ void lttng_probes_exit(void);
 int lttng_find_context(struct lttng_ctx *ctx, const char *name);
 int lttng_get_context_index(struct lttng_ctx *ctx, const char *name);
 struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p);
+void lttng_context_update(struct lttng_ctx *ctx);
 void lttng_remove_context_field(struct lttng_ctx **ctx_p,
                                struct lttng_ctx_field *field);
 void lttng_destroy_context(struct lttng_ctx *ctx);
@@ -542,12 +599,40 @@ int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_pthread_id_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_procname_to_ctx(struct lttng_ctx **ctx);
+int lttng_add_ip_to_ctx(struct lttng_ctx **ctx);
 void lttng_context_vtid_reset(void);
 void lttng_context_vpid_reset(void);
 
-extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata;
-extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_discard;
-extern const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite;
+#ifdef LTTNG_UST_HAVE_PERF_EVENT
+int lttng_add_perf_counter_to_ctx(uint32_t type,
+                                 uint64_t config,
+                                 const char *name,
+                                 struct lttng_ctx **ctx);
+int lttng_perf_counter_init(void);
+void lttng_perf_counter_exit(void);
+#else /* #ifdef LTTNG_UST_HAVE_PERF_EVENT */
+static inline
+int lttng_add_perf_counter_to_ctx(uint32_t type,
+                                 uint64_t config,
+                                 const char *name,
+                                 struct lttng_ctx **ctx)
+{
+       return -ENOSYS;
+}
+static inline
+int lttng_perf_counter_init(void)
+{
+       return 0;
+}
+static inline
+void lttng_perf_counter_exit(void)
+{
+}
+#endif /* #else #ifdef LTTNG_UST_HAVE_PERF_EVENT */
+
+extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_metadata;
+extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_discard;
+extern const struct lttng_ust_client_lib_ring_buffer_client_cb *lttng_client_callbacks_overwrite;
 
 struct lttng_transport *lttng_transport_find(const char *name);
 
@@ -569,4 +654,12 @@ void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime);
 struct cds_list_head *lttng_get_probe_list_head(void);
 int lttng_session_active(void);
 
+typedef int (*t_statedump_func_ptr)(struct lttng_session *session);
+void lttng_handle_pending_statedump(void *owner);
+struct cds_list_head *_lttng_get_sessions(void);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LTTNG_UST_EVENTS_H */
This page took 0.027094 seconds and 4 git commands to generate.