X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Foptional.h;h=dcb7ca8639fd67ddac916ea84816e24e0b2b2b5e;hb=48a4000561343808724f7cb5fa8c131877489ccd;hp=faa64bf604e424adc2aefcda50b044c028c0a507;hpb=a321667af6f25a77e32787fe89ad306786f7b29a;p=lttng-tools.git

diff --git a/src/common/optional.h b/src/common/optional.h
index faa64bf60..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,35 +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;			\
 	})
 
 /*
  * This macro is available as a 'convenience' to allow sites that assume
- * an optional value is set to assert() that it is set when fecthing the
+ * 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)			\
 	({						\
-		assert((optional).is_set);		\
+		LTTNG_ASSERT((optional).is_set);		\
 		&(optional).value;			\
 	})
 
 /*
- * Initialize an optional field.
+ * 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)	\