mirror of https://github.com/grpc/grpc.git
[arena] Add ManagedNew(), gtest-ify test (#30159)
* [arena] Add ManagedNew(), gtest-ify test Add a ManagedNew() method to Arena that calls the relevant destructor at Arena destruction time. There are some cases coming up in the promise based call work where this becomes super convenient, and I expect it's likely that there are other places that's true too. * Automated change: Fix sanity tests * review feedback * use construct/destruct more * Automated change: Fix sanity tests * Automated change: Fix sanity tests * fix * Automated change: Fix sanity tests Co-authored-by: ctiller <ctiller@users.noreply.github.com>pull/30170/head
Craig Tiller
2 years ago
committed by
GitHub
parent
c835402dd9
commit
15ae89e1fc
11 changed files with 303 additions and 213 deletions
@ -1,136 +0,0 @@ |
|||||||
/*
|
|
||||||
* |
|
||||||
* Copyright 2017 gRPC authors. |
|
||||||
* |
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
||||||
* you may not use this file except in compliance with the License. |
|
||||||
* You may obtain a copy of the License at |
|
||||||
* |
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
* |
|
||||||
* Unless required by applicable law or agreed to in writing, software |
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, |
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
||||||
* See the License for the specific language governing permissions and |
|
||||||
* limitations under the License. |
|
||||||
* |
|
||||||
*/ |
|
||||||
|
|
||||||
#include "src/core/lib/resource_quota/arena.h" |
|
||||||
|
|
||||||
#include <inttypes.h> |
|
||||||
#include <string.h> |
|
||||||
|
|
||||||
#include "absl/strings/str_format.h" |
|
||||||
#include "absl/strings/str_join.h" |
|
||||||
|
|
||||||
#include <grpc/support/alloc.h> |
|
||||||
#include <grpc/support/log.h> |
|
||||||
#include <grpc/support/string_util.h> |
|
||||||
#include <grpc/support/sync.h> |
|
||||||
|
|
||||||
#include "src/core/lib/gpr/string.h" |
|
||||||
#include "src/core/lib/gpr/useful.h" |
|
||||||
#include "src/core/lib/gprpp/thd.h" |
|
||||||
#include "src/core/lib/resource_quota/resource_quota.h" |
|
||||||
#include "test/core/util/test_config.h" |
|
||||||
|
|
||||||
using grpc_core::Arena; |
|
||||||
|
|
||||||
static auto* g_memory_allocator = new grpc_core::MemoryAllocator( |
|
||||||
grpc_core::ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator( |
|
||||||
"test")); |
|
||||||
|
|
||||||
static void test_noop(void) { Arena::Create(1, g_memory_allocator)->Destroy(); } |
|
||||||
|
|
||||||
static void test(const char* name, size_t init_size, const size_t* allocs, |
|
||||||
size_t nallocs) { |
|
||||||
std::vector<std::string> parts; |
|
||||||
parts.push_back( |
|
||||||
absl::StrFormat("test '%s': %" PRIdPTR " <- {", name, init_size)); |
|
||||||
for (size_t i = 0; i < nallocs; i++) { |
|
||||||
parts.push_back(absl::StrFormat("%" PRIdPTR ",", allocs[i])); |
|
||||||
} |
|
||||||
parts.push_back("}"); |
|
||||||
std::string s = absl::StrJoin(parts, ""); |
|
||||||
gpr_log(GPR_INFO, "%s", s.c_str()); |
|
||||||
|
|
||||||
Arena* a = Arena::Create(init_size, g_memory_allocator); |
|
||||||
void** ps = static_cast<void**>(gpr_zalloc(sizeof(*ps) * nallocs)); |
|
||||||
for (size_t i = 0; i < nallocs; i++) { |
|
||||||
ps[i] = a->Alloc(allocs[i]); |
|
||||||
// ensure the returned address is aligned
|
|
||||||
GPR_ASSERT(((intptr_t)ps[i] & 0xf) == 0); |
|
||||||
// ensure no duplicate results
|
|
||||||
for (size_t j = 0; j < i; j++) { |
|
||||||
GPR_ASSERT(ps[i] != ps[j]); |
|
||||||
} |
|
||||||
// ensure writable
|
|
||||||
memset(ps[i], 1, allocs[i]); |
|
||||||
} |
|
||||||
a->Destroy(); |
|
||||||
gpr_free(ps); |
|
||||||
} |
|
||||||
|
|
||||||
#define TEST(name, init_size, ...) \ |
|
||||||
static const size_t allocs_##name[] = {__VA_ARGS__}; \
|
|
||||||
test(#name, init_size, allocs_##name, GPR_ARRAY_SIZE(allocs_##name)) |
|
||||||
|
|
||||||
#define CONCURRENT_TEST_THREADS 10 |
|
||||||
|
|
||||||
size_t concurrent_test_iterations() { |
|
||||||
if (sizeof(void*) < 8) return 1000; |
|
||||||
return 100000; |
|
||||||
} |
|
||||||
|
|
||||||
typedef struct { |
|
||||||
gpr_event ev_start; |
|
||||||
Arena* arena; |
|
||||||
} concurrent_test_args; |
|
||||||
|
|
||||||
static void concurrent_test_body(void* arg) { |
|
||||||
concurrent_test_args* a = static_cast<concurrent_test_args*>(arg); |
|
||||||
gpr_event_wait(&a->ev_start, gpr_inf_future(GPR_CLOCK_REALTIME)); |
|
||||||
for (size_t i = 0; i < concurrent_test_iterations(); i++) { |
|
||||||
*static_cast<char*>(a->arena->Alloc(1)) = static_cast<char>(i); |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
static void concurrent_test(void) { |
|
||||||
gpr_log(GPR_DEBUG, "concurrent_test"); |
|
||||||
|
|
||||||
concurrent_test_args args; |
|
||||||
gpr_event_init(&args.ev_start); |
|
||||||
args.arena = Arena::Create(1024, g_memory_allocator); |
|
||||||
|
|
||||||
grpc_core::Thread thds[CONCURRENT_TEST_THREADS]; |
|
||||||
|
|
||||||
for (int i = 0; i < CONCURRENT_TEST_THREADS; i++) { |
|
||||||
thds[i] = |
|
||||||
grpc_core::Thread("grpc_concurrent_test", concurrent_test_body, &args); |
|
||||||
thds[i].Start(); |
|
||||||
} |
|
||||||
|
|
||||||
gpr_event_set(&args.ev_start, reinterpret_cast<void*>(1)); |
|
||||||
|
|
||||||
for (auto& th : thds) { |
|
||||||
th.Join(); |
|
||||||
} |
|
||||||
|
|
||||||
args.arena->Destroy(); |
|
||||||
} |
|
||||||
|
|
||||||
int main(int argc, char* argv[]) { |
|
||||||
grpc::testing::TestEnvironment env(&argc, argv); |
|
||||||
|
|
||||||
test_noop(); |
|
||||||
TEST(0_1, 0, 1); |
|
||||||
TEST(1_1, 1, 1); |
|
||||||
TEST(1_2, 1, 2); |
|
||||||
TEST(1_3, 1, 3); |
|
||||||
TEST(1_inc, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); |
|
||||||
TEST(6_123, 6, 1, 2, 3); |
|
||||||
concurrent_test(); |
|
||||||
|
|
||||||
return 0; |
|
||||||
} |
|
||||||
@ -0,0 +1,171 @@ |
|||||||
|
/*
|
||||||
|
* |
||||||
|
* Copyright 2017 gRPC authors. |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
* |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "src/core/lib/resource_quota/arena.h" |
||||||
|
|
||||||
|
#include <inttypes.h> |
||||||
|
#include <string.h> |
||||||
|
|
||||||
|
#include <algorithm> |
||||||
|
#include <ostream> |
||||||
|
#include <string> |
||||||
|
#include <vector> |
||||||
|
|
||||||
|
#include "absl/memory/memory.h" |
||||||
|
#include "absl/strings/str_join.h" |
||||||
|
#include "gtest/gtest.h" |
||||||
|
|
||||||
|
#include <grpc/grpc.h> |
||||||
|
#include <grpc/support/sync.h> |
||||||
|
#include <grpc/support/time.h> |
||||||
|
|
||||||
|
#include "src/core/lib/gprpp/ref_counted_ptr.h" |
||||||
|
#include "src/core/lib/gprpp/thd.h" |
||||||
|
#include "src/core/lib/resource_quota/resource_quota.h" |
||||||
|
|
||||||
|
using grpc_core::Arena; |
||||||
|
|
||||||
|
static auto* g_memory_allocator = new grpc_core::MemoryAllocator( |
||||||
|
grpc_core::ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator( |
||||||
|
"test")); |
||||||
|
|
||||||
|
TEST(ArenaTest, NoOp) { Arena::Create(1, g_memory_allocator)->Destroy(); } |
||||||
|
|
||||||
|
TEST(ArenaTest, ManagedNew) { |
||||||
|
Arena* arena = Arena::Create(1, g_memory_allocator); |
||||||
|
for (int i = 0; i < 100; i++) { |
||||||
|
arena->ManagedNew<std::unique_ptr<int>>(absl::make_unique<int>(i)); |
||||||
|
} |
||||||
|
arena->Destroy(); |
||||||
|
} |
||||||
|
|
||||||
|
struct AllocShape { |
||||||
|
size_t initial_size; |
||||||
|
std::vector<size_t> allocs; |
||||||
|
}; |
||||||
|
|
||||||
|
std::ostream& operator<<(std::ostream& out, const AllocShape& shape) { |
||||||
|
out << "AllocShape{initial_size=" << shape.initial_size |
||||||
|
<< ", allocs=" << absl::StrJoin(shape.allocs, ",") << "}"; |
||||||
|
return out; |
||||||
|
} |
||||||
|
|
||||||
|
class AllocTest : public ::testing::TestWithParam<AllocShape> {}; |
||||||
|
|
||||||
|
TEST_P(AllocTest, Works) { |
||||||
|
Arena* a = Arena::Create(GetParam().initial_size, g_memory_allocator); |
||||||
|
std::vector<void*> allocated; |
||||||
|
for (auto alloc : GetParam().allocs) { |
||||||
|
void* p = a->Alloc(alloc); |
||||||
|
// ensure the returned address is aligned
|
||||||
|
EXPECT_EQ(((intptr_t)p & 0xf), 0); |
||||||
|
// ensure no duplicate results
|
||||||
|
for (auto other_p : allocated) { |
||||||
|
EXPECT_NE(p, other_p); |
||||||
|
} |
||||||
|
// ensure writable
|
||||||
|
memset(p, 1, alloc); |
||||||
|
allocated.push_back(p); |
||||||
|
} |
||||||
|
a->Destroy(); |
||||||
|
} |
||||||
|
|
||||||
|
INSTANTIATE_TEST_SUITE_P( |
||||||
|
AllocTests, AllocTest, |
||||||
|
::testing::Values(AllocShape{0, {1}}, AllocShape{1, {1}}, |
||||||
|
AllocShape{1, {2}}, AllocShape{1, {3}}, |
||||||
|
AllocShape{1, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}}, |
||||||
|
AllocShape{6, {1, 2, 3}})); |
||||||
|
|
||||||
|
#define CONCURRENT_TEST_THREADS 10 |
||||||
|
|
||||||
|
size_t concurrent_test_iterations() { |
||||||
|
if (sizeof(void*) < 8) return 1000; |
||||||
|
return 100000; |
||||||
|
} |
||||||
|
|
||||||
|
typedef struct { |
||||||
|
gpr_event ev_start; |
||||||
|
Arena* arena; |
||||||
|
} concurrent_test_args; |
||||||
|
|
||||||
|
TEST(ArenaTest, ConcurrentAlloc) { |
||||||
|
concurrent_test_args args; |
||||||
|
gpr_event_init(&args.ev_start); |
||||||
|
args.arena = Arena::Create(1024, g_memory_allocator); |
||||||
|
|
||||||
|
grpc_core::Thread thds[CONCURRENT_TEST_THREADS]; |
||||||
|
|
||||||
|
for (int i = 0; i < CONCURRENT_TEST_THREADS; i++) { |
||||||
|
thds[i] = grpc_core::Thread( |
||||||
|
"grpc_concurrent_test", |
||||||
|
[](void* arg) { |
||||||
|
concurrent_test_args* a = static_cast<concurrent_test_args*>(arg); |
||||||
|
gpr_event_wait(&a->ev_start, gpr_inf_future(GPR_CLOCK_REALTIME)); |
||||||
|
for (size_t i = 0; i < concurrent_test_iterations(); i++) { |
||||||
|
*static_cast<char*>(a->arena->Alloc(1)) = static_cast<char>(i); |
||||||
|
} |
||||||
|
}, |
||||||
|
&args); |
||||||
|
thds[i].Start(); |
||||||
|
} |
||||||
|
|
||||||
|
gpr_event_set(&args.ev_start, reinterpret_cast<void*>(1)); |
||||||
|
|
||||||
|
for (auto& th : thds) { |
||||||
|
th.Join(); |
||||||
|
} |
||||||
|
|
||||||
|
args.arena->Destroy(); |
||||||
|
} |
||||||
|
|
||||||
|
TEST(ArenaTest, ConcurrentManagedNew) { |
||||||
|
concurrent_test_args args; |
||||||
|
gpr_event_init(&args.ev_start); |
||||||
|
args.arena = Arena::Create(1024, g_memory_allocator); |
||||||
|
|
||||||
|
grpc_core::Thread thds[CONCURRENT_TEST_THREADS]; |
||||||
|
|
||||||
|
for (int i = 0; i < CONCURRENT_TEST_THREADS; i++) { |
||||||
|
thds[i] = grpc_core::Thread( |
||||||
|
"grpc_concurrent_test", |
||||||
|
[](void* arg) { |
||||||
|
concurrent_test_args* a = static_cast<concurrent_test_args*>(arg); |
||||||
|
gpr_event_wait(&a->ev_start, gpr_inf_future(GPR_CLOCK_REALTIME)); |
||||||
|
for (size_t i = 0; i < concurrent_test_iterations(); i++) { |
||||||
|
a->arena->ManagedNew<std::unique_ptr<int>>( |
||||||
|
absl::make_unique<int>(static_cast<int>(i))); |
||||||
|
} |
||||||
|
}, |
||||||
|
&args); |
||||||
|
thds[i].Start(); |
||||||
|
} |
||||||
|
|
||||||
|
gpr_event_set(&args.ev_start, reinterpret_cast<void*>(1)); |
||||||
|
|
||||||
|
for (auto& th : thds) { |
||||||
|
th.Join(); |
||||||
|
} |
||||||
|
|
||||||
|
args.arena->Destroy(); |
||||||
|
} |
||||||
|
|
||||||
|
int main(int argc, char* argv[]) { |
||||||
|
::testing::InitGoogleTest(&argc, argv); |
||||||
|
return RUN_ALL_TESTS(); |
||||||
|
} |
||||||
Loading…
Reference in new issue