Cleanup tracepoint.c

[lttng-ust.git] / include / lttng / align.h

diff --git a/include/lttng/align.h b/include/lttng/align.h
index 12fc61b9070f90322370ccb23c641cdfd9d15e51..0a5363ea3e7161897465b469c52617f32dd2adc7 100644 (file)
--- a/include/lttng/align.h
+++ b/include/lttng/align.h
@@ -6,16 +6,24 @@
  *
  * (C) Copyright 2010-2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ *
+ * Permission is hereby granted to use or copy this program
+ * for any purpose,  provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
  */
 
 #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