mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-01-03 11:09:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: ensure macro args are evaluated only once

Browse source 
In ROUND_UP and ROUND_DOWN
Make some better versions of the ROUND_DOWN_N and ROUND_UP_N
macros.

Fixes #2724
This commit is contained in:
Wim Taymans 2022-09-30 16:18:32 +02:00
parent d7e2ce9931
commit 365ebcda9b
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
spa/include/spa/utils/defs.h
View file

@ -82,7 +82,8 @@ extern "C" {
#endif #endif
#define SPA_FLAG_MASK(field,mask,flag) (((field) & (mask)) == (flag)) #define SPA_FLAG_MASK(field,mask,flag) (((field) & (mask)) == (flag))
#define SPA_FLAG_IS_SET(field,flag) SPA_FLAG_MASK(field,flag,flag) #define SPA_FLAG_IS_SET(field,flag) SPA_FLAG_MASK(field, flag, flag)
#define SPA_FLAG_SET(field,flag) ((field) |= (flag)) #define SPA_FLAG_SET(field,flag) ((field) |= (flag))
#define SPA_FLAG_CLEAR(field, flag) \ #define SPA_FLAG_CLEAR(field, flag) \
({ \ ({ \
@ -145,16 +146,16 @@ struct spa_fraction {
__typeof__(a) _a = (a); \ __typeof__(a) _a = (a); \
SPA_LIKELY(_a >= 0) ? _a : -_a; \ SPA_LIKELY(_a >= 0) ? _a : -_a; \
}) })
#define SPA_MIN(a,b) \ #define SPA_MIN(a,b) \
({ \ ({ \
__typeof__(a) _min_a = (a); \ __typeof__(a) _min_a = (a); \
__typeof__(b) _min_b = (b); \ __typeof__(b) _min_b = (b); \
SPA_LIKELY(_min_a <= _min_b) ? _min_a : _min_b; \ SPA_LIKELY(_min_a <= _min_b) ? _min_a : _min_b; \
}) })
#define SPA_MAX(a,b) \ #define SPA_MAX(a,b) \
({ \ ({ \
__typeof__(a) _max_a = (a); \ __typeof__(a) _max_a = (a); \
__typeof__(b) _max_b = (b); \ __typeof__(b) _max_b = (b); \
SPA_LIKELY(_max_a >= _max_b) ? _max_a : _max_b; \ SPA_LIKELY(_max_a >= _max_b) ? _max_a : _max_b; \
}) })
#define SPA_CLAMP(v,low,high) \ #define SPA_CLAMP(v,low,high) \
@ -174,7 +175,7 @@ struct spa_fraction {
#define SPA_SWAP(a,b) \ #define SPA_SWAP(a,b) \
({ \ ({ \
__typeof__(a) _t = (a); \ __typeof__(a) _t = (a); \
(a) = b; (b) = _t; \ (a) = b; (b) = _t; \
}) })
#define SPA_TYPECHECK(type,x) \ #define SPA_TYPECHECK(type,x) \
@ -254,21 +255,21 @@ struct spa_fraction {
#define SPA_RESTRICT #define SPA_RESTRICT
#endif #endif
#define SPA_ROUND_DOWN(num,value) ((num) - ((num) % (value))) #define SPA_ROUND_DOWN(num,value) \
#define SPA_ROUND_UP(num,value) ((((num) + (value) - 1) / (value)) * (value)) ({ \
__typeof__(num) _num = (num); \
#define SPA_MASK_NEGATED(num1, num2) \ ((_num) - ((_num) % (value))); \
({ \ })
SPA_STATIC_ASSERT(__builtin_constant_p(num2) ? \ #define SPA_ROUND_UP(num,value) \
(__typeof__(num2))(__typeof__(num1))(__typeof__(num2))(num2) == (num2) : \ ({ \
sizeof(num1) >= sizeof(num2), \ __typeof__(value) _v = (value); \
"truncation problem when masking " #num1 \ ((((num) + (_v) - 1) / (_v)) * (_v)); \
" with ~" #num2); \
((num1) & ~(__typeof__(num1))(num2)); \
}) })
#define SPA_ROUND_DOWN_N(num,align) SPA_MASK_NEGATED((num), (align) - 1) #define SPA_ROUND_MASK(num,mask) ((__typeof__(num))((mask)-1))
#define SPA_ROUND_UP_N(num,align) SPA_ROUND_DOWN_N((num) + ((align) - 1),align)
#define SPA_ROUND_DOWN_N(num,align) ((num) & ~SPA_ROUND_MASK(num, align))
#define SPA_ROUND_UP_N(num,align) ((((num)-1) | SPA_ROUND_MASK(num, align))+1)
#define SPA_PTR_ALIGNMENT(p,align) ((intptr_t)(p) & ((align)-1)) #define SPA_PTR_ALIGNMENT(p,align) ((intptr_t)(p) & ((align)-1))
#define SPA_IS_ALIGNED(p,align) (SPA_PTR_ALIGNMENT(p,align) == 0) #define SPA_IS_ALIGNED(p,align) (SPA_PTR_ALIGNMENT(p,align) == 0)