X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=8a7abd641be5b31e39d829ace52b98810f8f6d79;hb=ba99fbe29216df4090f308bbe805bd93db470938;hp=9a74ed4d44bf576ff3e1bf0381b79310276967a6;hpb=d7d45c0dc2815c77a947c745dfa79ed4060cc1c5;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 9a74ed4d..8a7abd64 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -286,7 +286,6 @@ struct lttng_event_desc {
 	union {
 		struct {
 			const char **model_emf_uri;
-			void (*event_notifier_callback)(void);
 		} ext;
 		char padding[LTTNG_UST_EVENT_DESC_PADDING];
 	} u;
@@ -350,10 +349,18 @@ struct lttng_bytecode_runtime {
 
 struct lttng_ust_event_common_private;
 
+enum lttng_ust_event_type {
+	LTTNG_UST_EVENT_TYPE_RECORDER = 0,
+	LTTNG_UST_EVENT_TYPE_NOTIFIER = 1,
+};
+
 struct lttng_ust_event_common {
 	uint32_t struct_size;				/* Size of this structure. */
 	struct lttng_ust_event_common_private *priv;	/* Private event interface */
 
+	enum lttng_ust_event_type type;
+	void *child;					/* Pointer to child, for inheritance by aggregation. */
+
 	int enabled;
 	int has_enablers_without_bytecode;
 	/* list of struct lttng_bytecode_runtime, sorted by seqnum */
@@ -364,7 +371,7 @@ struct lttng_ust_event_recorder_private;
 
 struct lttng_ust_event_recorder {
 	uint32_t struct_size;				/* Size of this structure. */
-	struct lttng_ust_event_common *parent;
+	struct lttng_ust_event_common *parent;		/* Inheritance by aggregation. */
 	struct lttng_ust_event_recorder_private *priv;	/* Private event record interface */
 
 	unsigned int id;
@@ -376,7 +383,7 @@ struct lttng_ust_event_notifier_private;
 
 struct lttng_ust_event_notifier {
 	uint32_t struct_size;				/* Size of this structure. */
-	struct lttng_ust_event_common *parent;
+	struct lttng_ust_event_common *parent;		/* Inheritance by aggregation. */
 	struct lttng_ust_event_notifier_private *priv;	/* Private event notifier interface */
 
 	void (*notification_send)(struct lttng_ust_event_notifier *event_notifier,