X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=include%2Fcommon.h;fp=include%2Fcommon.h;h=d8811a9d0d5fa5bb1d9553b047e48dbd1e0ee5fa;hp=2931c4d2bb031b8af7a2e1a550e08b013c6c2c05;hb=5aa9223647fbb52fa8941d92c8896ebaf148b41c;hpb=973c2b13fe82d6ebd030cd58869fa237b1fe5370 diff --git a/include/common.h b/include/common.h index 2931c4d..d8811a9 100644 --- a/include/common.h +++ b/include/common.h @@ -16,13 +16,15 @@ #define CACHE_LINE_SIZE 64 // 64 byte cache line on x86 and x86-64 #define CACHE_LINE_SCALE 6 // log base 2 of the cache line size -#define EXPECT_TRUE(x) __builtin_expect(!!(x), 1) -#define EXPECT_FALSE(x) __builtin_expect(!!(x), 0) +#define EXPECT_TRUE(x) __builtin_expect(!!(x), 1) +#define EXPECT_FALSE(x) __builtin_expect(!!(x), 0) -#define SYNC_SWAP __sync_lock_test_and_set -#define SYNC_CAS __sync_val_compare_and_swap -#define SYNC_ADD __sync_add_and_fetch -#define SYNC_FETCH_AND_OR __sync_fetch_and_or +#define SYNC_SWAP __sync_lock_test_and_set +#define SYNC_CAS __sync_val_compare_and_swap +#define SYNC_ADD __sync_add_and_fetch +#define SYNC_FETCH_AND_OR __sync_fetch_and_or + +#define COUNT_TRAILING_ZEROS __builtin_ctz #define MASK(n) ((1ULL << (n)) - 1) @@ -50,6 +52,7 @@ typedef unsigned long long uint64_t; typedef unsigned int uint32_t; +typedef unsigned short uint16_t; typedef unsigned char uint8_t; typedef size_t markable_t;