Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Default to a lower max block size for Android users, where memory is limited and precious

Browse Source 
PiperOrigin-RevId: 722720783
pull/20192/head
Protobuf Team Bot 3 weeks ago committed by Copybara-Service
parent 156130815a
commit d5d69e0927
5 changed files with 67 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      upb/mem/arena.c
  2. 3
      upb/mem/arena.h
  3. 23
      upb/mem/arena_test.cc
  4. 62
      upb/port/def.inc
  5. 1
      upb/port/undef.inc

2
upb/mem/arena.c
Unescape View File

@ -21,7 +21,7 @@
// Must be last.
#include "upb/port/def.inc"
static UPB_ATOMIC(size_t) g_max_block_size = 32 << 10;
static UPB_ATOMIC(size_t) g_max_block_size = UPB_DEFAULT_MAX_BLOCK_SIZE;
void upb_Arena_SetMaxBlockSize(size_t max) {
upb_Atomic_Store(&g_max_block_size, max, memory_order_relaxed);

3
upb/mem/arena.h
Unescape View File

@ -90,6 +90,9 @@ UPB_API_INLINE void* upb_Arena_Malloc(struct upb_Arena* a, size_t size);
UPB_API_INLINE void* upb_Arena_Realloc(upb_Arena* a, void* ptr, size_t oldsize,
size_t size);
static const size_t UPB_PRIVATE(kUpbDefaultMaxBlockSize) =
UPB_DEFAULT_MAX_BLOCK_SIZE;
// Sets the maximum block size for all arenas. This is a global configuration
// setting that will affect all existing and future arenas. If
// upb_Arena_Malloc() is called with a size larger than this, we will exceed

23
upb/mem/arena_test.cc
Unescape View File

@ -166,7 +166,7 @@ class OverheadTest {
~OverheadTest() {
upb_Arena_Free(arena_);
upb_Arena_SetMaxBlockSize(32 << 10);
upb_Arena_SetMaxBlockSize(UPB_PRIVATE(kUpbDefaultMaxBlockSize));
}
upb_Arena* arena_;
@ -189,8 +189,13 @@ TEST(OverheadTest, SingleMassiveBlockThenLittle) {
test.Alloc(64);
}
if (!UPB_ASAN) {
#ifdef __ANDROID__
EXPECT_NEAR(test.WastePct(), 0.21, 0.025);
EXPECT_NEAR(test.AmortizedAlloc(), 0.05, 0.025);
#else
EXPECT_NEAR(test.WastePct(), 0.6, 0.025);
EXPECT_NEAR(test.AmortizedAlloc(), 0.05, 0.025);
#endif
}
}
@ -236,15 +241,25 @@ TEST(OverheadTest, SmallBlocksLargerThanInitial_many) {
test.Alloc(initial_block_size * 2 + 1);
}
if (!UPB_ASAN) {
#ifdef __ANDROID__
EXPECT_NEAR(test.WastePct(), 0.09, 0.025);
EXPECT_NEAR(test.AmortizedAlloc(), 0.12, 0.025);
#else
EXPECT_NEAR(test.WastePct(), 0.14, 0.025);
EXPECT_NEAR(test.AmortizedAlloc(), 0.08, 0.025);
#endif
}
for (int i = 0; i < 900; i++) {
test.Alloc(initial_block_size * 2 + 1);
}
if (!UPB_ASAN) {
#ifdef __ANDROID__
EXPECT_NEAR(test.WastePct(), 0.05, 0.03);
EXPECT_NEAR(test.AmortizedAlloc(), 0.08, 0.025);
#else
EXPECT_NEAR(test.WastePct(), 0.03, 0.025);
EXPECT_NEAR(test.AmortizedAlloc(), 0.05, 0.025);
#endif
}
}
@ -469,7 +484,7 @@ TEST(ArenaTest, FuzzFuseFreeAllocatorRace) {
upb_alloc_func* old = upb_alloc_global.func;
upb_alloc_global.func = checking_global_allocfunc;
absl::Cleanup reset_max_block_size = [old] {
upb_Arena_SetMaxBlockSize(32 << 10);
upb_Arena_SetMaxBlockSize(UPB_PRIVATE(kUpbDefaultMaxBlockSize));
upb_alloc_global.func = old;
};
absl::Notification done;
@ -518,7 +533,7 @@ TEST(ArenaTest, FuzzFuseFreeAllocatorRace) {
TEST(ArenaTest, FuzzFuseSpaceAllocatedRace) {
upb_Arena_SetMaxBlockSize(128);
absl::Cleanup reset_max_block_size = [] {
upb_Arena_SetMaxBlockSize(32 << 10);
upb_Arena_SetMaxBlockSize(UPB_PRIVATE(kUpbDefaultMaxBlockSize));
};
absl::Notification done;
std::vector<std::thread> threads;
@ -575,7 +590,7 @@ TEST(ArenaTest, FuzzFuseSpaceAllocatedRace) {
TEST(ArenaTest, FuzzAllocSpaceAllocatedRace) {
upb_Arena_SetMaxBlockSize(128);
absl::Cleanup reset_max_block_size = [] {
upb_Arena_SetMaxBlockSize(32 << 10);
upb_Arena_SetMaxBlockSize(UPB_PRIVATE(kUpbDefaultMaxBlockSize));
};
upb_Arena* arena = upb_Arena_New();
absl::Notification done;

62
upb/port/def.inc
Unescape View File

@ -62,7 +62,7 @@ Error, UINTPTR_MAX is undefined
/* If we always read/write as a consistent type to each address, this shouldn't
* violate aliasing.
*/
#define UPB_PTR_AT(msg, ofs, type) ((type*)((char*)(msg) + (ofs)))
#define UPB_PTR_AT(msg, ofs, type) ((type *)((char *)(msg) + (ofs)))
// A flexible array member may have lower alignment requirements than the struct
// overall - in that case, it can overlap with the trailing padding of the rest
@ -83,7 +83,7 @@ Error, UINTPTR_MAX is undefined
// UPB_INLINE: inline if possible, emit standalone code if required.
#ifdef __cplusplus
#define UPB_INLINE inline
#elif defined (__GNUC__) || defined(__clang__)
#elif defined(__GNUC__) || defined(__clang__)
#define UPB_INLINE static __inline__
#else
#define UPB_INLINE static
@ -117,7 +117,13 @@ Error, UINTPTR_MAX is undefined
#ifdef __clang__
#define UPB_ALIGN_OF(type) _Alignof(type)
#else
#define UPB_ALIGN_OF(type) offsetof (struct { char c; type member; }, member)
#define UPB_ALIGN_OF(type) \
offsetof( \
struct { \
char c; \
type member; \
}, \
member)
#endif
#ifdef _MSC_VER
@ -128,7 +134,7 @@ Error, UINTPTR_MAX is undefined
#endif
// Hints to the compiler about likely/unlikely branches.
#if defined (__GNUC__) || defined(__clang__)
#if defined(__GNUC__) || defined(__clang__)
#define UPB_LIKELY(x) __builtin_expect((bool)(x), 1)
#define UPB_UNLIKELY(x) __builtin_expect((bool)(x), 0)
#else
@ -152,13 +158,14 @@ Error, UINTPTR_MAX is undefined
#define UPB_FORCEINLINE __inline__ __attribute__((always_inline)) static
#define UPB_NOINLINE __attribute__((noinline))
#define UPB_NORETURN __attribute__((__noreturn__))
#define UPB_PRINTF(str, first_vararg) __attribute__((format (printf, str, first_vararg)))
#define UPB_PRINTF(str, first_vararg) \
__attribute__((format(printf, str, first_vararg)))
#elif defined(_MSC_VER)
#define UPB_NOINLINE
#define UPB_FORCEINLINE static
#define UPB_NORETURN __declspec(noreturn)
#define UPB_PRINTF(str, first_vararg)
#else /* !defined(__GNUC__) */
#else /* !defined(__GNUC__) */
#define UPB_FORCEINLINE static
#define UPB_NOINLINE
#define UPB_NORETURN
@ -173,11 +180,15 @@ Error, UINTPTR_MAX is undefined
// UPB_ASSUME(): in release mode, we tell the compiler to assume this is true.
#ifdef NDEBUG
#ifdef __GNUC__
#define UPB_ASSUME(expr) if (!(expr)) __builtin_unreachable()
#define UPB_ASSUME(expr) \
if (!(expr)) __builtin_unreachable()
#elif defined _MSC_VER
#define UPB_ASSUME(expr) if (!(expr)) __assume(0)
#define UPB_ASSUME(expr) \
if (!(expr)) __assume(0)
#else
#define UPB_ASSUME(expr) do {} while (false && (expr))
#define UPB_ASSUME(expr) \
do { \
} while (false && (expr))
#endif
#else
#define UPB_ASSUME(expr) assert(expr)
@ -186,13 +197,19 @@ Error, UINTPTR_MAX is undefined
/* UPB_ASSERT(): in release mode, we use the expression without letting it be
* evaluated. This prevents "unused variable" warnings. */
#ifdef NDEBUG
#define UPB_ASSERT(expr) do {} while (false && (expr))
#define UPB_ASSERT(expr) \
do { \
} while (false && (expr))
#else
#define UPB_ASSERT(expr) assert(expr)
#endif
#if defined(__GNUC__) || defined(__clang__)
#define UPB_UNREACHABLE() do { assert(0); __builtin_unreachable(); } while(0)
#define UPB_UNREACHABLE() \
do { \
assert(0); \
__builtin_unreachable(); \
} while (0)
#elif defined(_MSC_VER)
#define UPB_UNREACHABLE() \
do { \
@ -200,7 +217,16 @@ Error, UINTPTR_MAX is undefined
__assume(0); \
} while (0)
#else
#define UPB_UNREACHABLE() do { assert(0); } while(0)
#define UPB_UNREACHABLE() \
do { \
assert(0); \
} while (0)
#endif
#ifdef __ANDROID__
#define UPB_DEFAULT_MAX_BLOCK_SIZE 8192;
#else
#define UPB_DEFAULT_MAX_BLOCK_SIZE 32768;
#endif
/* UPB_SETJMP() / UPB_LONGJMP() */
@ -348,10 +374,10 @@ Error, UINTPTR_MAX is undefined
#ifdef __cplusplus
extern "C" {
#endif
void __asan_poison_memory_region(void const volatile *addr, size_t size);
void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
void __asan_poison_memory_region(void const volatile *addr, size_t size);
void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
#ifdef __cplusplus
} /* extern "C" */
} /* extern "C" */
#endif
#define UPB_POISON_MEMORY_REGION(addr, size) \
__asan_poison_memory_region((addr), (size))
@ -360,10 +386,8 @@ void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
#else
#define UPB_ASAN 0
#define UPB_ASAN_GUARD_SIZE 0
#define UPB_POISON_MEMORY_REGION(addr, size) \
((void)(addr), (void)(size))
#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
((void)(addr), (void)(size))
#define UPB_POISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
#define UPB_UNPOISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
#endif
#if defined(__SANITIZE_THREAD__) || UPB_CLANG_TSAN

1
upb/port/undef.inc
Unescape View File

@ -36,6 +36,7 @@
#undef UPB_ASSUME
#undef UPB_ASSERT
#undef UPB_UNREACHABLE
#undef UPB_DEFAULT_MAX_BLOCK_SIZE
#undef UPB_SETJMP
#undef UPB_LONGJMP
#undef UPB_PTRADD

Write Preview
Loading…
Cancel
Save