diff options
author | 2017-04-04 07:14:06 -0700 | |
---|---|---|
committer | 2017-04-04 07:14:06 -0700 | |
commit | 14af85e8d2359bbd28afe06a5690a6004991e65b (patch) | |
tree | 23eb9c4372bc012981ed20bf3dbfca2a05ff0879 | |
parent | 3b17e8aad7432f00a34384f1c4ece6a6656818cb (diff) | |
parent | a044424430a2b9d57318c3fc92c471dfa01075d1 (diff) |
Merge pull request #10447 from ctiller/arena
Fix arena_test on 32-bit platforms (includes Windows)
-rw-r--r-- | test/core/support/arena_test.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/core/support/arena_test.c b/test/core/support/arena_test.c index 35b2bbd1b1..9eba8a0fa6 100644 --- a/test/core/support/arena_test.c +++ b/test/core/support/arena_test.c @@ -83,9 +83,13 @@ static void test(const char *name, size_t init_size, const size_t *allocs, static const size_t allocs_##name[] = {__VA_ARGS__}; \ test(#name, init_size, allocs_##name, GPR_ARRAY_SIZE(allocs_##name)) -#define CONCURRENT_TEST_ITERATIONS 100000 #define CONCURRENT_TEST_THREADS 100 +size_t concurrent_test_iterations() { + if (sizeof(void *) < 8) return 1000; + return 100000; +} + typedef struct { gpr_event ev_start; gpr_arena *arena; @@ -94,7 +98,7 @@ typedef struct { static void concurrent_test_body(void *arg) { concurrent_test_args *a = arg; gpr_event_wait(&a->ev_start, gpr_inf_future(GPR_CLOCK_REALTIME)); - for (size_t i = 0; i < CONCURRENT_TEST_ITERATIONS; i++) { + for (size_t i = 0; i < concurrent_test_iterations(); i++) { *(char *)gpr_arena_alloc(a->arena, 1) = (char)i; } } |