X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Falign.h;h=283926826d2c520999fecf57bf1bd43a6c2305c1;hb=75181c4b1b6e046ae8561c486ced003a83b1a696;hp=94d0d6e3f3adb02ae03524f245e70d85ac1bfb53;hpb=a60d70e608a727038ebc27e493aac65b49932146;p=lttng-ust.git

diff --git a/include/lttng/align.h b/include/lttng/align.h
index 94d0d6e3..28392682 100644
--- a/include/lttng/align.h
+++ b/include/lttng/align.h
@@ -17,12 +17,13 @@
  */
 
 #include <lttng/bug.h>
+#include <unistd.h>
 
-/*
- * Align pointer on natural object alignment.
- */
-#define object_align(obj)	PTR_ALIGN(obj, __alignof__(*(obj)))
-#define object_align_floor(obj)	PTR_ALIGN_FLOOR(obj, __alignof__(*(obj)))
+#define PAGE_SIZE		sysconf(_SC_PAGE_SIZE)
+#define PAGE_MASK		(~(PAGE_SIZE - 1))
+#define __ALIGN_MASK(v, mask)	(((v) + (mask)) & ~(mask))
+#define ALIGN(v, align)		__ALIGN_MASK(v, (typeof(v)) (align) - 1)
+#define PAGE_ALIGN(addr)	ALIGN(addr, PAGE_SIZE)
 
 /**
  * offset_align - Calculate the offset needed to align an object on its natural
@@ -35,7 +36,7 @@
  */
 #define offset_align(align_drift, alignment)				       \
 	({								       \
-		BUILD_RUNTIME_BUG_ON((alignment) == 0			       \
+		LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0		       \
 				   || ((alignment) & ((alignment) - 1)));      \
 		(((alignment) - (align_drift)) & ((alignment) - 1));	       \
 	})
@@ -50,7 +51,7 @@
  */
 #define offset_align_floor(align_drift, alignment)			       \
 	({								       \
-		BUILD_RUNTIME_BUG_ON((alignment) == 0			       \
+		LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0		       \
 				   || ((alignment) & ((alignment) - 1)));      \
 		(((align_drift) - (alignment)) & ((alignment) - 1);	       \
 	})