Add LTTNG_PACKED ifdefs to validate that it is defined

If LTTNG_PACKED is used to specify whether a structure is packed, but we
end up forgetting inclusion of lttng/ust-compiler.h (which defines it),
we end up silently _not_ packing the data structure, because
LTTNG_PACKED will be considered to be an identifier by the compiler,
and therefore simply ignored.

There are no such instances in lttng-ust, but let's add a ifdef check.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-abi.h b/include/lttng/ust-abi.h
index 4976b1bf61ce4786c1288933e29f0f4dcb6fb315..01e9daf44a4dcf7f6915d3b20cc43a7b27ce2c8c 100644 (file)
--- a/include/lttng/ust-abi.h
+++ b/include/lttng/ust-abi.h
@@ -30,6 +30,10 @@
 #include <stdint.h>
 #include <lttng/ust-compiler.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 #ifndef __ust_stringify
 #define __ust_stringify1(x)    #x
 #define __ust_stringify(x)     __ust_stringify1(x)

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index f83124d11bbd9276100642dff9a4041a0ac892bc..57758edb19d15efe5032a5eebf4e4d3e1c1367b4 100644 (file)
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -23,6 +23,10 @@
 #include <sys/types.h>
 #include <limits.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 #ifndef LTTNG_UST_UUID_LEN
 #define LTTNG_UST_UUID_LEN     16
 #endif

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 902f2b2f24826ffdcff90b25afba079f6a1030aa..fefb8585536c6173e1d624954f58a8fba89421e9 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -39,6 +39,10 @@
 #include <urcu/ref.h>
 #include <pthread.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/include/ust-comm.h b/include/ust-comm.h
index 6a08b306b1b9ade6b44cf722d8b3d26a73281600..10dbca2148c9e3f178c97517aa6cd501516b8099 100644 (file)
--- a/include/ust-comm.h
+++ b/include/ust-comm.h
@@ -34,6 +34,10 @@
 #include <lttng/ust-ctl.h>
 #include <config.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 /*
  * Default timeout the application waits for the sessiond to send its
  * "register done" command. Can be overridden with the environment

diff --git a/liblttng-ust/filter-bytecode.h b/liblttng-ust/filter-bytecode.h
index 9a2d4c0a0c04e454be39c96212620f60565237d3..7df0288ae071c46ecd6edb016b77a32fbd61d2c8 100644 (file)
--- a/liblttng-ust/filter-bytecode.h
+++ b/liblttng-ust/filter-bytecode.h
@@ -29,6 +29,10 @@
 
 #include <lttng/ust-abi.h>
 
+#ifndef LTTNG_PACKED
+#error "LTTNG_PACKED should be defined"
+#endif
+
 /*
  * offsets are absolute from start of bytecode.
  */