From 58d904a328c0d849769b483e901a0be9426b8209 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期二, 20 七月 2021 20:20:44 +0800 Subject: [PATCH] 调整Request C.BHFree的位置 --- src/bh_util.h | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/src/bh_util.h b/src/bh_util.h index e3ab70b..1b7d2c2 100644 --- a/src/bh_util.h +++ b/src/bh_util.h @@ -18,6 +18,7 @@ #ifndef BH_UTIL_SOXWOK67 #define BH_UTIL_SOXWOK67 +#include "macro.h" #include <functional> #include <mutex> #include <stdint.h> @@ -40,8 +41,8 @@ inline void Put16(void *p, uint16_t u) { auto ptr = static_cast<uint8_t *>(p); - ptr[0] = (uint8_t)(u >> 8u); - ptr[1] = (uint8_t)(u); + ptr[0] = (uint8_t) (u >> 8u); + ptr[1] = (uint8_t) (u); } inline uint32_t Get32(const void *p) @@ -55,10 +56,10 @@ inline void Put32(void *p, uint32_t u) { auto ptr = static_cast<uint8_t *>(p); - ptr[0] = (uint8_t)(u >> 24u); - ptr[1] = (uint8_t)(u >> 16u); - ptr[2] = (uint8_t)(u >> 8u); - ptr[3] = (uint8_t)(u); + ptr[0] = (uint8_t) (u >> 24u); + ptr[1] = (uint8_t) (u >> 16u); + ptr[2] = (uint8_t) (u >> 8u); + ptr[3] = (uint8_t) (u); } inline uint64_t Get64(const void *p) @@ -76,20 +77,22 @@ inline void Put64(void *p, uint64_t u) { auto ptr = static_cast<uint8_t *>(p); - ptr[0] = (uint8_t)(u >> 56); - ptr[1] = (uint8_t)(u >> 48); - ptr[2] = (uint8_t)(u >> 40u); - ptr[3] = (uint8_t)(u >> 32); - ptr[4] = (uint8_t)(u >> 24u); - ptr[5] = (uint8_t)(u >> 16u); - ptr[6] = (uint8_t)(u >> 8u); - ptr[7] = (uint8_t)(u); + ptr[0] = (uint8_t) (u >> 56); + ptr[1] = (uint8_t) (u >> 48); + ptr[2] = (uint8_t) (u >> 40u); + ptr[3] = (uint8_t) (u >> 32); + ptr[4] = (uint8_t) (u >> 24u); + ptr[5] = (uint8_t) (u >> 16u); + ptr[6] = (uint8_t) (u >> 8u); + ptr[7] = (uint8_t) (u); } inline void PutInt(void *p, uint8_t u) { Put8(p, u); } inline void PutInt(void *p, uint16_t u) { Put16(p, u); } inline void PutInt(void *p, uint32_t u) { Put32(p, u); } inline void PutInt(void *p, uint64_t u) { Put64(p, u); } + +constexpr uint64_t MaskBits(int nbits) { return (uint64_t(1) << nbits) - 1; } class ExitCall { @@ -142,13 +145,5 @@ return f(data_); } }; - -// macro helper -#define JOIN_IMPL(a, b) a##b -#define JOIN(a, b) JOIN_IMPL(a, b) -// defer function / lambda. -#define DEFERF(func) ExitCall JOIN(defer_, __LINE__)(func) -// defer simple expression -#define DEFER1(expr) DEFERF([&]() { expr; }) #endif /* end of include guard: BH_UTIL_SOXWOK67 */ -- Gitblit v1.8.0