callstack context: use delimiter when stack is incomplete

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

diff --git a/lttng-events.h b/lttng-events.h
index 173f369f067cf2362de97f486ac491939a4378e2..2b1370520ecd85ab4d39364586ee08fe949d1f6a 100644 (file)
--- a/lttng-events.h
+++ b/lttng-events.h
@@ -55,6 +55,8 @@ enum abstract_types {
        atype_array_compound,           /* Array of compound types. */
        atype_sequence_compound,        /* Sequence of compound types. */
        atype_variant,
+       atype_array_bitfield,
+       atype_sequence_bitfield,
        NR_ABSTRACT_TYPES,
 };
 
@@ -204,6 +206,9 @@ struct lttng_probe_ctx {
 struct lttng_ctx_field {
        struct lttng_event_field event_field;
        size_t (*get_size)(size_t offset);
+       size_t (*get_size_arg)(size_t offset, struct lttng_ctx_field *field,
+                              struct lib_ring_buffer_ctx *ctx,
+                              struct lttng_channel *chan);
        void (*record)(struct lttng_ctx_field *field,
                       struct lib_ring_buffer_ctx *ctx,
                       struct lttng_channel *chan);
@@ -214,6 +219,12 @@ struct lttng_ctx_field {
                struct lttng_perf_counter_field *perf_counter;
        } u;
        void (*destroy)(struct lttng_ctx_field *field);
+       /*
+        * Private data to keep state between get_size and record.
+        * User must perform its own synchronization to protect against
+        * concurrent and reentrant contexts.
+        */
+       void *priv;
 };
 
 struct lttng_ctx {
@@ -275,6 +286,7 @@ struct lttng_bytecode_runtime {
                        const char *filter_stack_data);
        int link_failed;
        struct list_head node;  /* list of bytecode runtime in event */
+       struct lttng_event *event;
 };
 
 /*
@@ -324,7 +336,7 @@ struct lttng_event {
 };
 
 enum lttng_enabler_type {
-       LTTNG_ENABLER_WILDCARD,
+       LTTNG_ENABLER_STAR_GLOB,
        LTTNG_ENABLER_NAME,
 };
 
@@ -702,6 +714,9 @@ int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)
        return -ENOSYS;
 }
 #endif
+
+int lttng_add_callstack_to_ctx(struct lttng_ctx **ctx, int type);
+
 #if defined(CONFIG_PERF_EVENTS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
 int lttng_add_perf_counter_to_ctx(uint32_t type,
                                  uint64_t config,
@@ -810,7 +825,7 @@ int lttng_kretprobes_event_enable_state(struct lttng_event *event,
 }
 #endif
 
-#ifdef CONFIG_DYNAMIC_FTRACE
+#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(LTTNG_FTRACE_MISSING_HEADER)
 int lttng_ftrace_register(const char *name,
                          const char *symbol_name,
                          struct lttng_event *event);