From 2b226adf60eac113e6c2780aa551c775e72511d6 Mon Sep 17 00:00:00 2001 From: Vijay Pai Date: Thu, 11 Jan 2018 16:11:35 -0800 Subject: Remove alarm from core, implement in C++ layer only --- test/cpp/common/BUILD | 4 +- test/cpp/common/alarm_cpp_test.cc | 192 -------------------------------------- test/cpp/common/alarm_test.cc | 192 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 194 insertions(+), 194 deletions(-) delete mode 100644 test/cpp/common/alarm_cpp_test.cc create mode 100644 test/cpp/common/alarm_test.cc (limited to 'test/cpp/common') diff --git a/test/cpp/common/BUILD b/test/cpp/common/BUILD index e2b6365b13..2cf3ad669f 100644 --- a/test/cpp/common/BUILD +++ b/test/cpp/common/BUILD @@ -19,8 +19,8 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package") grpc_package(name = "test/cpp/common") grpc_cc_test( - name = "alarm_cpp_test", - srcs = ["alarm_cpp_test.cc"], + name = "alarm_test", + srcs = ["alarm_test.cc"], deps = [ "//:grpc++_unsecure", "//test/core/util:gpr_test_util", diff --git a/test/cpp/common/alarm_cpp_test.cc b/test/cpp/common/alarm_cpp_test.cc deleted file mode 100644 index 7adc3102f4..0000000000 --- a/test/cpp/common/alarm_cpp_test.cc +++ /dev/null @@ -1,192 +0,0 @@ -/* - * - * Copyright 2015 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 -#include -#include - -#include - -#include "test/core/util/test_config.h" - -namespace grpc { -namespace { - -TEST(AlarmTest, RegularExpiry) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - Alarm alarm; - alarm.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); - - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); - - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, MultithreadedRegularExpiry) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - void* output_tag; - bool ok; - CompletionQueue::NextStatus status; - Alarm alarm; - - std::thread t1([&alarm, &cq, &junk] { - alarm.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); - }); - - std::thread t2([&cq, &ok, &output_tag, &status] { - status = cq.AsyncNext((void**)&output_tag, &ok, - grpc_timeout_seconds_to_deadline(2)); - }); - - t1.join(); - t2.join(); - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, DeprecatedRegularExpiry) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - Alarm alarm(&cq, grpc_timeout_seconds_to_deadline(1), junk); - - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); - - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, MoveConstructor) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - Alarm first; - first.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); - Alarm second(std::move(first)); - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, MoveAssignment) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - Alarm first; - first.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); - Alarm second(std::move(first)); - first = std::move(second); - - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); - - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, RegularExpiryChrono) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - std::chrono::system_clock::time_point one_sec_deadline = - std::chrono::system_clock::now() + std::chrono::seconds(1); - Alarm alarm; - alarm.Set(&cq, one_sec_deadline, junk); - - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); - - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, ZeroExpiry) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - Alarm alarm; - alarm.Set(&cq, grpc_timeout_seconds_to_deadline(0), junk); - - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); - - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, NegativeExpiry) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - Alarm alarm; - alarm.Set(&cq, grpc_timeout_seconds_to_deadline(-1), junk); - - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); - - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_TRUE(ok); - EXPECT_EQ(junk, output_tag); -} - -TEST(AlarmTest, Cancellation) { - CompletionQueue cq; - void* junk = reinterpret_cast(1618033); - Alarm alarm; - alarm.Set(&cq, grpc_timeout_seconds_to_deadline(2), junk); - alarm.Cancel(); - - void* output_tag; - bool ok; - const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); - - EXPECT_EQ(status, CompletionQueue::GOT_EVENT); - EXPECT_FALSE(ok); - EXPECT_EQ(junk, output_tag); -} - -} // namespace -} // namespace grpc - -int main(int argc, char** argv) { - grpc_test_init(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/test/cpp/common/alarm_test.cc b/test/cpp/common/alarm_test.cc new file mode 100644 index 0000000000..7adc3102f4 --- /dev/null +++ b/test/cpp/common/alarm_test.cc @@ -0,0 +1,192 @@ +/* + * + * Copyright 2015 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 +#include +#include + +#include + +#include "test/core/util/test_config.h" + +namespace grpc { +namespace { + +TEST(AlarmTest, RegularExpiry) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + Alarm alarm; + alarm.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); + + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); + + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, MultithreadedRegularExpiry) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + void* output_tag; + bool ok; + CompletionQueue::NextStatus status; + Alarm alarm; + + std::thread t1([&alarm, &cq, &junk] { + alarm.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); + }); + + std::thread t2([&cq, &ok, &output_tag, &status] { + status = cq.AsyncNext((void**)&output_tag, &ok, + grpc_timeout_seconds_to_deadline(2)); + }); + + t1.join(); + t2.join(); + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, DeprecatedRegularExpiry) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + Alarm alarm(&cq, grpc_timeout_seconds_to_deadline(1), junk); + + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); + + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, MoveConstructor) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + Alarm first; + first.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); + Alarm second(std::move(first)); + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, MoveAssignment) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + Alarm first; + first.Set(&cq, grpc_timeout_seconds_to_deadline(1), junk); + Alarm second(std::move(first)); + first = std::move(second); + + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); + + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, RegularExpiryChrono) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + std::chrono::system_clock::time_point one_sec_deadline = + std::chrono::system_clock::now() + std::chrono::seconds(1); + Alarm alarm; + alarm.Set(&cq, one_sec_deadline, junk); + + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(2)); + + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, ZeroExpiry) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + Alarm alarm; + alarm.Set(&cq, grpc_timeout_seconds_to_deadline(0), junk); + + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); + + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, NegativeExpiry) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + Alarm alarm; + alarm.Set(&cq, grpc_timeout_seconds_to_deadline(-1), junk); + + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); + + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_TRUE(ok); + EXPECT_EQ(junk, output_tag); +} + +TEST(AlarmTest, Cancellation) { + CompletionQueue cq; + void* junk = reinterpret_cast(1618033); + Alarm alarm; + alarm.Set(&cq, grpc_timeout_seconds_to_deadline(2), junk); + alarm.Cancel(); + + void* output_tag; + bool ok; + const CompletionQueue::NextStatus status = cq.AsyncNext( + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); + + EXPECT_EQ(status, CompletionQueue::GOT_EVENT); + EXPECT_FALSE(ok); + EXPECT_EQ(junk, output_tag); +} + +} // namespace +} // namespace grpc + +int main(int argc, char** argv) { + grpc_test_init(argc, argv); + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} -- cgit v1.2.3