SoW-2020-0003: Trace Hit Counters

[lttng-tools.git] / src / bin / lttng-sessiond / ust-abi-internal.h

diff --git a/src/bin/lttng-sessiond/ust-abi-internal.h b/src/bin/lttng-sessiond/ust-abi-internal.h
index f560464286d19f888b61dc1e63001dfc32e4d0cb..413302c3266d209345cf275a5f0fd38a65b0ab57 100644 (file)
--- a/src/bin/lttng-sessiond/ust-abi-internal.h
+++ b/src/bin/lttng-sessiond/ust-abi-internal.h
@@ -95,6 +95,7 @@ struct lttng_ust_event {
 
        enum lttng_ust_loglevel_type loglevel_type;
        int loglevel;   /* value, -1: all */
+       uint64_t token;
        char padding[LTTNG_UST_EVENT_PADDING1];
 
        /* Per instrumentation type configuration */
@@ -109,9 +110,10 @@ struct lttng_ust_event_notifier {
        char padding[LTTNG_UST_EVENT_NOTIFIER_PADDING];
 } LTTNG_PACKED;
 
-#define LTTNG_UST_EVENT_NOTIFIER_NOTIFICATION_PADDING 34
+#define LTTNG_UST_EVENT_NOTIFIER_NOTIFICATION_PADDING 32
 struct lttng_ust_event_notifier_notification {
        uint64_t token;
+       uint16_t capture_buf_size;
        char padding[LTTNG_UST_EVENT_NOTIFIER_NOTIFICATION_PADDING];
 } LTTNG_PACKED;
 
@@ -263,6 +265,16 @@ struct lttng_ust_filter_bytecode {
        char data[0];
 } LTTNG_PACKED;
 
+#define CAPTURE_BYTECODE_MAX_LEN       65536
+#define LTTNG_UST_CAPTURE_PADDING      32
+struct lttng_ust_capture_bytecode {
+       uint32_t len;
+       uint32_t reloc_offset;
+       uint64_t seqnum;
+       char padding[LTTNG_UST_CAPTURE_PADDING];
+       char data[0];
+} LTTNG_PACKED;
+
 #define LTTNG_UST_EXCLUSION_PADDING    32
 struct lttng_ust_event_exclusion {
        uint32_t count;
@@ -287,6 +299,7 @@ struct lttng_ust_event_exclusion {
 #define LTTNG_UST_WAIT_QUIESCENT               _UST_CMD(0x43)
 #define LTTNG_UST_REGISTER_DONE                        _UST_CMD(0x44)
 #define LTTNG_UST_TRACEPOINT_FIELD_LIST                _UST_CMD(0x45)
+#define LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE  _UST_CMD(0x46)
 
 /* Session FD commands */
 #define LTTNG_UST_CHANNEL                      \
@@ -318,8 +331,9 @@ struct lttng_ust_event_exclusion {
 #define LTTNG_UST_FILTER                       _UST_CMD(0xA0)
 #define LTTNG_UST_EXCLUSION                    _UST_CMD(0xA1)
 
-#define LTTNG_UST_EVENT_NOTIFIER_SEND_FD       _UST_CMD(0xB0)
-#define LTTNG_UST_EVENT_NOTIFIER_CREATE                _UST_CMDW(0xB1, struct lttng_ust_event_notifier)
+/* Event notifier group commands */
+#define LTTNG_UST_EVENT_NOTIFIER_CREATE                \
+       _UST_CMDW(0xB0, struct lttng_ust_event_notifier)
 
 #define LTTNG_UST_ROOT_HANDLE  0