Fix: sessiond: leak of trigger on registration error

[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 5c22378cdfd7688471c5d6dffc1a45bc97919dc6..3892a7f5d011bfb270bb9372d14271eba52f44a5 100644 (file)
--- a/src/bin/lttng-sessiond/ust-abi-internal.h
+++ b/src/bin/lttng-sessiond/ust-abi-internal.h
@@ -1,27 +1,12 @@
 /*
- * Copied from LTTng-UST lttng/ust-abi.h
- *
- * LTTng-UST ABI header
+ * Copyright 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Copyright 2010-2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Copied from LTTng-UST lttng/ust-abi.h
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * LTTng-UST ABI header
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #ifndef LTTNG_UST_ABI_INTERNAL_H
@@ -118,6 +103,18 @@ struct lttng_ust_event {
        } u;
 } LTTNG_PACKED;
 
+#define LTTNG_UST_EVENT_NOTIFIER_PADDING       40
+struct lttng_ust_event_notifier {
+       struct lttng_ust_event event;
+       char padding[LTTNG_UST_EVENT_NOTIFIER_PADDING];
+} LTTNG_PACKED;
+
+#define LTTNG_UST_EVENT_NOTIFIER_NOTIFICATION_PADDING 34
+struct lttng_ust_event_notifier_notification {
+       uint64_t token;
+       char padding[LTTNG_UST_EVENT_NOTIFIER_NOTIFICATION_PADDING];
+} LTTNG_PACKED;
+
 enum lttng_ust_field_type {
        LTTNG_UST_FIELD_OTHER                   = 0,
        LTTNG_UST_FIELD_INTEGER                 = 1,
@@ -158,6 +155,7 @@ enum lttng_ust_context_type {
        LTTNG_UST_CONTEXT_VGID                  = 18,
        LTTNG_UST_CONTEXT_VEGID                 = 19,
        LTTNG_UST_CONTEXT_VSGID                 = 20,
+       LTTNG_UST_CONTEXT_TIME_NS               = 21,
 };
 
 struct lttng_ust_perf_counter_ctx {
@@ -289,6 +287,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                      \
@@ -320,6 +319,10 @@ struct lttng_ust_event_exclusion {
 #define LTTNG_UST_FILTER                       _UST_CMD(0xA0)
 #define LTTNG_UST_EXCLUSION                    _UST_CMD(0xA1)
 
+/* Event notifier group commands */
+#define LTTNG_UST_EVENT_NOTIFIER_CREATE                \
+       _UST_CMDW(0xB0, struct lttng_ust_event_notifier)
+
 #define LTTNG_UST_ROOT_HANDLE  0
 
 struct lttng_ust_obj;