X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Foptional.h;h=dcb7ca8639fd67ddac916ea84816e24e0b2b2b5e;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=05f6054dade7c0a8fecbf20b5ef0bb5de1023807;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/common/optional.h b/src/common/optional.h
index 05f6054da..dcb7ca863 100644
--- a/src/common/optional.h
+++ b/src/common/optional.h
@@ -9,7 +9,6 @@
 #define LTTNG_OPTIONAL_H
 
 #include <stdint.h>
-#include <assert.h>
 
 /*
  * Define wrapper structure representing an optional value.
@@ -56,24 +55,40 @@
 
 /*
  * This macro is available as a 'convenience' to allow sites that assume
- * an optional value is set to assert() that it is set when accessing it.
+ * an optional value is set to LTTNG_ASSERT() that it is set when accessing it.
  *
  * Since this returns the 'optional' by value, it is not suitable for all
  * wrapped optional types. It is meant to be used with PODs.
  */
 #define LTTNG_OPTIONAL_GET(optional)			\
-        ({						\
-		assert((optional).is_set);		\
+	({						\
+		LTTNG_ASSERT((optional).is_set);		\
 		(optional).value;			\
 	})
 
 /*
- * Initialize an optional field.
+ * This macro is available as a 'convenience' to allow sites that assume
+ * an optional value is set to LTTNG_ASSERT() that it is set when fecthing the
+ * underlying value's address.
+ */
+#define LTTNG_OPTIONAL_GET_PTR(optional)			\
+	({						\
+		LTTNG_ASSERT((optional).is_set);		\
+		&(optional).value;			\
+	})
+
+/*
+ * Initialize an optional field as unset.
  *
  * The wrapped field is set to the value it would gave if it had static storage
  * duration.
  */
-#define LTTNG_OPTIONAL_INIT { .is_set = 0 }
+#define LTTNG_OPTIONAL_INIT_UNSET { .is_set = 0 }
+
+/*
+ * Initialize an optional field as 'set' with a given value.
+ */
+#define LTTNG_OPTIONAL_INIT_VALUE(val) { .value = val, .is_set = 1 }
 
 /* Set the value of an optional field. */
 #define LTTNG_OPTIONAL_SET(field_ptr, val)	\