X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevents.h;h=a145024969b0dd41758446cd0113c5638010a915;hb=717c38f658248bc04ccfc6e7fdf5d03040c2a846;hp=bba28cc27518da62f0b5c39ad5259863309aea6e;hpb=b2e37d27accf5e32128b82392dbe1a9522c7dc20;p=lttng-ust.git

diff --git a/src/common/events.h b/src/common/events.h
index bba28cc2..a1450249 100644
--- a/src/common/events.h
+++ b/src/common/events.h
@@ -18,6 +18,13 @@
 #include "common/macros.h"
 #include "common/ust-context-provider.h"
 
+/*
+ * The context procname length is part of the LTTng-UST ABI.
+ * TODO: At the next breaking protocol bump, all users of this macro
+ * should instead use LTTNG_UST_ABI_PROCNAME_LEN.
+ */
+#define LTTNG_UST_CONTEXT_PROCNAME_LEN	17
+
 struct lttng_ust_abi_obj;
 struct lttng_event_notifier_group;
 
@@ -240,7 +247,12 @@ struct lttng_event_notifier_group {
 	void *owner;
 	int notification_fd;
 	struct cds_list_head node;		/* Event notifier group handle list */
-	struct cds_list_head enablers_head;
+
+	/* List of non-synchronized enablers */
+	struct cds_list_head unsync_enablers_head;
+	/* List of synchronized enablers */
+	struct cds_list_head sync_enablers_head;
+
 	struct cds_list_head event_notifiers_head; /* list of event_notifiers */
 	struct lttng_ust_event_notifier_ht event_notifiers_ht; /* hashtable of event_notifiers */
 	struct lttng_ust_ctx *ctx;		/* contexts for filters. */
@@ -324,13 +336,16 @@ struct lttng_ust_session_private {
 	struct cds_list_head events_head;	/* list of events */
 	struct cds_list_head node;		/* Session list */
 
-	/* List of enablers */
-	struct cds_list_head enablers_head;
+	/* List of non-synchronized enablers */
+	struct cds_list_head unsync_enablers_head;
+	/* List of synchronized enablers */
+	struct cds_list_head sync_enablers_head;
+
 	struct lttng_ust_event_ht events_ht;	/* ht of events */
 	void *owner;				/* object owner */
-	int tstate:1;				/* Transient enable state */
+	unsigned int tstate:1;			/* Transient enable state */
 
-	int statedump_pending:1;
+	unsigned int statedump_pending:1;
 
 	struct lttng_ust_enum_ht enums_ht;	/* ht of enumerations */
 	struct cds_list_head enums_head;
@@ -378,7 +393,7 @@ struct lttng_ust_channel_common_private {
 	struct lttng_ust_channel_common *pub;	/* Public channel interface */
 
 	int objd;				/* Object associated with channel. */
-	int tstate:1;				/* Transient enable state */
+	unsigned int tstate:1;			/* Transient enable state */
 };
 
 struct lttng_ust_channel_buffer_private {
@@ -408,10 +423,13 @@ struct lttng_ust_abi_channel_config {
 	void *unused3;
 	void *unused4;
 	int unused5;
+	unsigned int _deprecated1;
+	unsigned int _deprecated2;
 	struct cds_list_head unused6;
 	void *unused7;
 	int unused8;
 	void *unused9;
+	unsigned int _deprecated3:1;
 
 	/* Channel ID */
 	unsigned int id;
@@ -571,9 +589,6 @@ struct lttng_enabler *lttng_event_notifier_enabler_as_enabler(
 
 
 
-/* This is ABI between liblttng-ust and liblttng-ust-ctl */
-struct lttng_transport *lttng_ust_transport_find(const char *name);
-
 /* This is ABI between liblttng-ust and liblttng-ust-dl */
 void lttng_ust_dl_update(void *ip);