X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Falign.hpp;h=fab15af8c77619c5b68a79e9c7d7c70b69911637;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hp=c957824af72d265800a1bd2ab0cd5e3179d3c051;hpb=f250b40e2179eccdb83766bf4abef5a35036c47b;p=lttng-tools.git diff --git a/src/common/align.hpp b/src/common/align.hpp index c957824af..fab15af8c 100644 --- a/src/common/align.hpp +++ b/src/common/align.hpp @@ -14,19 +14,17 @@ * Align value to the next multiple of align. Returns val if it already is a * multiple of align. Align must be a power of two. */ -#define __lttng_align_ceil_mask(v, mask) (((v) + (mask)) & ~(mask)) +#define __lttng_align_ceil_mask(v, mask) (((v) + (mask)) & ~(mask)) -#define lttng_align_ceil(v, align) \ - __lttng_align_ceil_mask(v, (__typeof__(v)) (align) - 1) +#define lttng_align_ceil(v, align) __lttng_align_ceil_mask(v, (__typeof__(v)) (align) -1) /* * Align value to the previous multiple of align. Returns val if it already is a * multiple of align. Align must be a power of two. */ -#define __lttng_align_floor_mask(v, mask) ((v) & ~(mask)) +#define __lttng_align_floor_mask(v, mask) ((v) & ~(mask)) -#define lttng_align_floor(v, align) \ - __lttng_align_floor_mask(v, (__typeof__(v)) (align) - 1) +#define lttng_align_floor(v, align) __lttng_align_floor_mask(v, (__typeof__(v)) (align) -1) /** * lttng_offset_align - Calculate the offset needed to align an object on its natural @@ -37,11 +35,10 @@ * Returns the offset that must be added to align towards higher * addresses. */ -#define lttng_offset_align(align_drift, alignment) \ - ({ \ - LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 \ - || ((alignment) & ((alignment) - 1))); \ - (((alignment) - (align_drift)) & ((alignment) - 1)); \ +#define lttng_offset_align(align_drift, alignment) \ + ({ \ + LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 || ((alignment) & ((alignment) -1))); \ + (((alignment) - (align_drift)) & ((alignment) -1)); \ }) /** @@ -52,11 +49,10 @@ * * Returns the offset that must be substracted to align towards lower addresses. */ -#define lttng_offset_align_floor(align_drift, alignment) \ - ({ \ - LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 \ - || ((alignment) & ((alignment) - 1))); \ - (((align_drift) - (alignment)) & ((alignment) - 1)); \ +#define lttng_offset_align_floor(align_drift, alignment) \ + ({ \ + LTTNG_BUILD_RUNTIME_BUG_ON((alignment) == 0 || ((alignment) & ((alignment) -1))); \ + (((align_drift) - (alignment)) & ((alignment) -1)); \ }) #endif /* _LTTNG_ALIGN_H */