Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT (#36440)

Browse Source 
[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT
Replacing GPR_ASSERT with absl CHECK

These changes have been made using string replacement and regex.

Will not be replacing all instances of CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites. Only ones which are doable using very simple regex with least chance of failure will be replaced.

Given that we have 5000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer.

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #36440

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36440 from tanvi-jagtap:tjagtap_iomgr_memory_usage a56570338e
PiperOrigin-RevId: 628276606
pull/36481/head
Tanvi Jagtap 11 months ago committed by Copybara-Service
parent c8f85ff037
commit 04dc9b1da0
15 changed files with 107 additions and 58 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. 9
      CMakeLists.txt
  2. 9
      build_autogenerated.yaml
  3. 19
      test/core/iomgr/BUILD
  4. 4
      test/core/iomgr/buffer_list_test.cc
  5. 10
      test/core/iomgr/endpoint_pair_test.cc
  6. 20
      test/core/iomgr/endpoint_tests.cc
  7. 4
      test/core/iomgr/fd_conservation_posix_test.cc
  8. 3
      test/core/iomgr/resolve_address_test.cc
  9. 4
      test/core/iomgr/socket_utils_test.cc
  10. 5
      test/core/memory_usage/BUILD
  11. 11
      test/core/memory_usage/callback_client.cc
  12. 3
      test/core/memory_usage/callback_server.cc
  13. 28
      test/core/memory_usage/client.cc
  14. 3
      test/core/memory_usage/memstats.cc
  15. 33
      test/core/memory_usage/server.cc

9
CMakeLists.txt generated
Unescape View File

@ -5815,6 +5815,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
target_link_libraries(fd_conservation_posix_test
${_gRPC_ALLTARGETS_LIBRARIES}
absl::check
grpc_test_util
)
@ -8332,6 +8333,7 @@ target_include_directories(buffer_list_test
target_link_libraries(buffer_list_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
)
@ -12865,6 +12867,7 @@ target_include_directories(endpoint_pair_test
target_link_libraries(endpoint_pair_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
)
@ -13015,6 +13018,7 @@ target_include_directories(error_test
target_link_libraries(error_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
)
@ -23760,6 +23764,7 @@ target_include_directories(resolve_address_using_ares_resolver_test
target_link_libraries(resolve_address_using_ares_resolver_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
grpc++_test_config
)
@ -23866,6 +23871,7 @@ target_include_directories(resolve_address_using_native_resolver_test
target_link_libraries(resolve_address_using_native_resolver_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
grpc++_test_config
)
@ -26606,6 +26612,7 @@ target_include_directories(secure_endpoint_test
target_link_libraries(secure_endpoint_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
)
@ -28454,6 +28461,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX)
target_link_libraries(socket_utils_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
)
@ -29595,6 +29603,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
target_link_libraries(tcp_posix_test
${_gRPC_ALLTARGETS_LIBRARIES}
gtest
absl::check
grpc_test_util
)

9
build_autogenerated.yaml generated
Unescape View File

@ -5140,6 +5140,7 @@ targets:
- test/core/util/slice_splitter.cc
- test/core/util/tracer_util.cc
deps:
- absl/log:check
- grpc_test_util
platforms:
- linux
@ -6274,6 +6275,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
- name: byte_buffer_test
gtest: true
@ -8985,6 +8987,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
- name: env_test
gtest: true
@ -9042,6 +9045,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
uses_polling: false
- name: error_utils_test
@ -15310,6 +15314,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
- grpc++_test_config
- name: resolve_address_using_native_resolver_posix_test
@ -15379,6 +15384,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
- grpc++_test_config
- name: resource_quota_end2end_stress_test
@ -17759,6 +17765,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
- name: security_connector_test
gtest: true
@ -18704,6 +18711,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
platforms:
- linux
@ -19183,6 +19191,7 @@ targets:
- test/core/util/tracer_util.cc
deps:
- gtest
- absl/log:check
- grpc_test_util
platforms:
- linux

19
test/core/iomgr/BUILD
Unescape View File

@ -26,6 +26,7 @@ grpc_cc_library(
name = "endpoint_tests",
srcs = ["endpoint_tests.cc"],
hdrs = ["endpoint_tests.h"],
external_deps = ["absl/log:check"],
language = "C++",
visibility = [
"//test:__subpackages__",
@ -59,7 +60,10 @@ grpc_cc_test(
grpc_cc_test(
name = "endpoint_pair_test",
srcs = ["endpoint_pair_test.cc"],
external_deps = ["gtest"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",
tags = [
"endpoint_test",
@ -95,6 +99,7 @@ grpc_cc_test(
grpc_cc_test(
name = "fd_conservation_posix_test",
srcs = ["fd_conservation_posix_test.cc"],
external_deps = ["absl/log:check"],
language = "C++",
tags = ["no_windows"],
deps = [
@ -180,6 +185,7 @@ grpc_cc_test(
name = "resolve_address_using_ares_resolver_test",
srcs = ["resolve_address_test.cc"],
external_deps = [
"absl/log:check",
"absl/strings",
"gtest",
],
@ -198,6 +204,7 @@ grpc_cc_test(
name = "resolve_address_using_native_resolver_test",
srcs = ["resolve_address_test.cc"],
external_deps = [
"absl/log:check",
"absl/strings",
"gtest",
],
@ -215,7 +222,10 @@ grpc_cc_test(
grpc_cc_test(
name = "socket_utils_test",
srcs = ["socket_utils_test.cc"],
external_deps = ["gtest"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",
tags = ["no_windows"],
deps = [
@ -270,7 +280,10 @@ grpc_cc_test(
grpc_cc_test(
name = "buffer_list_test",
srcs = ["buffer_list_test.cc"],
external_deps = ["gtest"],
external_deps = [
"absl/log:check",
"gtest",
],
language = "C++",
deps = [
"//:gpr",

4
test/core/iomgr/buffer_list_test.cc
Unescape View File

@ -20,6 +20,8 @@
#include <gtest/gtest.h>
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/time.h>
@ -37,7 +39,7 @@ extern gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type);
static gpr_timespec g_now;
gpr_timespec now_impl(gpr_clock_type clock_type) {
GPR_ASSERT(clock_type != GPR_TIMESPAN);
CHECK(clock_type != GPR_TIMESPAN);
gpr_timespec ts = g_now;
ts.clock_type = clock_type;
return ts;

10
test/core/iomgr/endpoint_pair_test.cc
Unescape View File

@ -22,6 +22,8 @@
#include <gtest/gtest.h>
#include "absl/log/check.h"
#include <grpc/event_engine/event_engine.h>
#include <grpc/grpc.h>
#include <grpc/support/alloc.h>
@ -58,7 +60,7 @@ grpc_endpoint_pair grpc_iomgr_event_engine_shim_endpoint_pair(
std::string target_addr = absl::StrCat(
"ipv6:[::1]:", std::to_string(grpc_pick_unused_port_or_die()));
auto resolved_addr = URIToResolvedAddress(target_addr);
GPR_ASSERT(resolved_addr.ok());
CHECK_OK(resolved_addr);
std::unique_ptr<EventEngine::Endpoint> client_endpoint;
std::unique_ptr<EventEngine::Endpoint> server_endpoint;
grpc_core::Notification client_signal;
@ -80,13 +82,13 @@ grpc_endpoint_pair grpc_iomgr_event_engine_shim_endpoint_pair(
std::move(accept_cb), [](absl::Status /*status*/) {}, config,
std::make_unique<grpc_core::MemoryQuota>("foo"));
GPR_ASSERT(listener->Bind(*resolved_addr).ok());
GPR_ASSERT(listener->Start().ok());
CHECK_OK(listener->Bind(*resolved_addr));
CHECK_OK(listener->Start());
ee->Connect(
[&client_endpoint, &client_signal](
absl::StatusOr<std::unique_ptr<EventEngine::Endpoint>> endpoint) {
GPR_ASSERT(endpoint.ok());
CHECK_OK(endpoint);
client_endpoint = std::move(*endpoint);
client_signal.Notify();
},

20
test/core/iomgr/endpoint_tests.cc
Unescape View File

@ -22,6 +22,8 @@
#include <stdbool.h>
#include <sys/types.h>
#include "absl/log/check.h"
#include <grpc/slice.h>
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
@ -61,7 +63,7 @@ size_t count_slices(grpc_slice* slices, size_t nslices, int* current_data) {
for (i = 0; i < nslices; ++i) {
buf = GRPC_SLICE_START_PTR(slices[i]);
for (j = 0; j < GRPC_SLICE_LENGTH(slices[i]); ++j) {
GPR_ASSERT(buf[j] == *current_data);
CHECK(buf[j] == *current_data);
*current_data = (*current_data + 1) % 256;
}
num_bytes += GRPC_SLICE_LENGTH(slices[i]);
@ -99,7 +101,7 @@ static grpc_slice* allocate_blocks(size_t num_bytes, size_t slice_size,
(*current_data)++;
}
}
GPR_ASSERT(num_bytes_left == 0);
CHECK_EQ(num_bytes_left, 0u);
return slices;
}
@ -273,9 +275,9 @@ static void read_and_write_test(grpc_endpoint_test_config config,
gpr_mu_lock(g_mu);
while (!state.read_done || !state.write_done) {
grpc_pollset_worker* worker = nullptr;
GPR_ASSERT(grpc_core::Timestamp::Now() < deadline);
GPR_ASSERT(GRPC_LOG_IF_ERROR(
"pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
CHECK(grpc_core::Timestamp::Now() < deadline);
CHECK(GRPC_LOG_IF_ERROR("pollset_work",
grpc_pollset_work(g_pollset, &worker, deadline)));
}
gpr_mu_unlock(g_mu);
grpc_core::ExecCtx::Get()->Flush();
@ -290,7 +292,7 @@ static void read_and_write_test(grpc_endpoint_test_config config,
static void inc_on_failure(void* arg, grpc_error_handle error) {
gpr_mu_lock(g_mu);
*static_cast<int*>(arg) += (!error.ok());
GPR_ASSERT(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr)));
CHECK(GRPC_LOG_IF_ERROR("kick", grpc_pollset_kick(g_pollset, nullptr)));
gpr_mu_unlock(g_mu);
}
@ -302,13 +304,13 @@ static void wait_for_fail_count(int* fail_count, int want_fail_count) {
while (grpc_core::Timestamp::Now() < deadline &&
*fail_count < want_fail_count) {
grpc_pollset_worker* worker = nullptr;
GPR_ASSERT(GRPC_LOG_IF_ERROR(
"pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
CHECK(GRPC_LOG_IF_ERROR("pollset_work",
grpc_pollset_work(g_pollset, &worker, deadline)));
gpr_mu_unlock(g_mu);
grpc_core::ExecCtx::Get()->Flush();
gpr_mu_lock(g_mu);
}
GPR_ASSERT(*fail_count == want_fail_count);
CHECK(*fail_count == want_fail_count);
gpr_mu_unlock(g_mu);
}

4
test/core/iomgr/fd_conservation_posix_test.cc
Unescape View File

@ -18,6 +18,8 @@
#include <sys/resource.h>
#include "absl/log/check.h"
#include <grpc/grpc.h>
#include <grpc/support/log.h>
@ -40,7 +42,7 @@ int main(int argc, char** argv) {
// verify we can create and destroy many more than this number
// of descriptors
rlim.rlim_cur = rlim.rlim_max = 1000;
GPR_ASSERT(0 == setrlimit(RLIMIT_NOFILE, &rlim));
CHECK_EQ(setrlimit(RLIMIT_NOFILE, &rlim), 0);
for (i = 0; i < 10000; i++) {
p = grpc_iomgr_create_endpoint_pair("test", nullptr);
grpc_endpoint_destroy(p.client);

3
test/core/iomgr/resolve_address_test.cc
Unescape View File

@ -25,6 +25,7 @@
#include <gtest/gtest.h>
#include "absl/functional/bind_front.h"
#include "absl/log/check.h"
#include "absl/strings/match.h"
#include <grpc/grpc.h>
@ -546,7 +547,7 @@ int main(int argc, char** argv) {
} else if (absl::StrContains(std::string(argv[0]), "using_ares_resolver")) {
g_resolver_type = "ares";
} else {
GPR_ASSERT(0);
CHECK(0);
}
grpc_core::ConfigVars::Overrides overrides;
overrides.dns_resolver = g_resolver_type;

4
test/core/iomgr/socket_utils_test.cc
Unescape View File

@ -28,6 +28,8 @@
#include <gtest/gtest.h>
#include "absl/log/check.h"
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
#include <grpc/support/sync.h>
@ -198,7 +200,7 @@ TEST(SocketUtilsTest, MainTest) {
if (grpc_ipv6_loopback_available()) {
sock = socket(AF_INET6, SOCK_STREAM, 0);
GPR_ASSERT(sock > 0);
CHECK_GT(sock, 0);
test_set_socket_dscp_ipv6(sock, 8 /*CS1*/);
test_set_socket_dscp_ipv6(sock, 16 /*CS2*/);

5
test/core/memory_usage/BUILD
Unescape View File

@ -26,6 +26,7 @@ grpc_cc_library(
],
hdrs = ["memstats.h"],
external_deps = [
"absl/log:check",
"absl/types:optional",
],
tags = [
@ -44,6 +45,7 @@ grpc_cc_binary(
external_deps = [
"absl/flags:flag",
"absl/flags:parse",
"absl/log:check",
],
tags = [
"bazel_only",
@ -66,6 +68,7 @@ grpc_cc_binary(
external_deps = [
"absl/flags:flag",
"absl/flags:parse",
"absl/log:check",
],
tags = [
"bazel_only",
@ -90,6 +93,7 @@ grpc_cc_binary(
external_deps = [
"absl/flags:flag",
"absl/flags:parse",
"absl/log:check",
"absl/time",
],
tags = [
@ -115,6 +119,7 @@ grpc_cc_binary(
external_deps = [
"absl/flags:flag",
"absl/flags:parse",
"absl/log:check",
],
tags = [
"bazel_only",

11
test/core/memory_usage/callback_client.cc
Unescape View File

@ -27,6 +27,7 @@
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
#include "absl/log/check.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
@ -124,7 +125,7 @@ std::shared_ptr<CallParams> GetBeforeSnapshot(
int main(int argc, char** argv) {
absl::ParseCommandLine(argc, argv);
char* fake_argv[1];
GPR_ASSERT(argc >= 1);
CHECK_GE(argc, 1);
fake_argv[0] = argv[0];
grpc::testing::TestEnvironment env(&argc, argv);
if (absl::GetFlag(FLAGS_target).empty()) {
@ -158,10 +159,10 @@ int main(int argc, char** argv) {
// Checking that all channels are still open
for (int i = 0; i < size; ++i) {
GPR_ASSERT(!std::exchange(channels_list[i], nullptr)
->WaitForStateChange(GRPC_CHANNEL_READY,
std::chrono::system_clock::now() +
std::chrono::milliseconds(1)));
CHECK(!std::exchange(channels_list[i], nullptr)
->WaitForStateChange(GRPC_CHANNEL_READY,
std::chrono::system_clock::now() +
std::chrono::milliseconds(1)));
}
std::string prefix;

3
test/core/memory_usage/callback_server.cc
Unescape View File

@ -24,6 +24,7 @@
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
#include "absl/log/check.h"
#include <grpc/support/log.h>
#include <grpcpp/grpcpp.h>
@ -77,7 +78,7 @@ static void sigint_handler(int /*x*/) { _exit(0); }
int main(int argc, char** argv) {
absl::ParseCommandLine(argc, argv);
char* fake_argv[1];
GPR_ASSERT(argc >= 1);
CHECK_GE(argc, 1);
fake_argv[0] = argv[0];
grpc::testing::TestEnvironment env(&argc, argv);
grpc_init();

28
test/core/memory_usage/client.cc
Unescape View File

@ -27,6 +27,7 @@
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
#include "absl/log/check.h"
#include "absl/strings/match.h"
#include <grpc/byte_buffer.h>
@ -91,10 +92,10 @@ static void init_ping_pong_request(int call_idx) {
grpc_slice_from_static_string("/Reflector/reflectUnary"), &hostname,
gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
metadata_ops,
(size_t)(op - metadata_ops),
tag(call_idx), nullptr));
CHECK(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
metadata_ops,
(size_t)(op - metadata_ops),
tag(call_idx), nullptr));
grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
}
@ -111,10 +112,9 @@ static void finish_ping_pong_request(int call_idx) {
op->data.recv_status_on_client.status_details = &calls[call_idx].details;
op++;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
status_ops,
(size_t)(op - status_ops),
tag(call_idx), nullptr));
CHECK(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call, status_ops,
(size_t)(op - status_ops),
tag(call_idx), nullptr));
grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
grpc_metadata_array_destroy(&calls[call_idx].initial_metadata_recv);
grpc_metadata_array_destroy(&calls[call_idx].trailing_metadata_recv);
@ -155,17 +155,17 @@ static MemStats send_snapshot_request(int call_idx, grpc_slice call_type) {
calls[call_idx].call = grpc_channel_create_call(
channel, nullptr, GRPC_PROPAGATE_DEFAULTS, cq, call_type, &hostname,
gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
snapshot_ops,
(size_t)(op - snapshot_ops),
(void*)nullptr, nullptr));
CHECK(GRPC_CALL_OK == grpc_call_start_batch(calls[call_idx].call,
snapshot_ops,
(size_t)(op - snapshot_ops),
(void*)nullptr, nullptr));
grpc_completion_queue_next(cq, gpr_inf_future(GPR_CLOCK_REALTIME), nullptr);
gpr_log(GPR_INFO, "Call %d status %d (%s)", call_idx, calls[call_idx].status,
std::string(grpc_core::StringViewFromSlice(calls[call_idx].details))
.c_str());
GPR_ASSERT(response_payload_recv != nullptr);
CHECK_NE(response_payload_recv, nullptr);
grpc_byte_buffer_reader reader;
grpc_byte_buffer_reader_init(&reader, response_payload_recv);
grpc_slice response = grpc_byte_buffer_reader_readall(&reader);
@ -238,7 +238,7 @@ int main(int argc, char** argv) {
grpc_slice slice = grpc_slice_from_copied_string("x");
char* fake_argv[1];
GPR_ASSERT(argc >= 1);
CHECK_GE(argc, 1);
fake_argv[0] = argv[0];
grpc::testing::TestEnvironment env(&argc, argv);

3
test/core/memory_usage/memstats.cc
Unescape View File

@ -19,6 +19,7 @@
#include <fstream>
#include <string>
#include "absl/log/check.h"
#include "absl/strings/str_cat.h"
#include <grpc/support/log.h>
@ -47,7 +48,7 @@ long GetMemUsage(absl::optional<int> pid) {
stat_stream.close();
// pid does not connect to an existing process
GPR_ASSERT(!state.empty());
CHECK(!state.empty());
// Calculations in case x86-64 is configured to use 2MB pages
long page_size_kb = sysconf(_SC_PAGE_SIZE) / 1024;

33
test/core/memory_usage/server.cc
Unescape View File

@ -33,6 +33,7 @@
#include "absl/base/attributes.h"
#include "absl/flags/flag.h"
#include "absl/flags/parse.h"
#include "absl/log/check.h"
#include "absl/status/status.h"
#include <grpc/byte_buffer.h>
@ -107,9 +108,8 @@ static void send_initial_metadata_unary(void* tag) {
metadata_ops[0].op = GRPC_OP_SEND_INITIAL_METADATA;
metadata_ops[0].data.send_initial_metadata.count = 0;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call,
metadata_ops, 1, tag,
nullptr));
CHECK(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call,
metadata_ops, 1, tag, nullptr));
}
static void send_status(void* tag) {
@ -119,9 +119,8 @@ static void send_status(void* tag) {
grpc_slice details = grpc_slice_from_static_string("");
status_op.data.send_status_from_server.status_details = &details;
GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call,
&status_op, 1, tag,
nullptr));
CHECK(GRPC_CALL_OK == grpc_call_start_batch((*(fling_call*)tag).call,
&status_op, 1, tag, nullptr));
}
static void send_snapshot(void* tag, MemStats* snapshot) {
@ -153,9 +152,9 @@ static void send_snapshot(void* tag, MemStats* snapshot) {
op->data.recv_close_on_server.cancelled = &was_cancelled;
op++;
GPR_ASSERT(GRPC_CALL_OK ==
grpc_call_start_batch((*(fling_call*)tag).call, snapshot_ops,
(size_t)(op - snapshot_ops), tag, nullptr));
CHECK(GRPC_CALL_OK ==
grpc_call_start_batch((*(fling_call*)tag).call, snapshot_ops,
(size_t)(op - snapshot_ops), tag, nullptr));
}
// We have some sort of deadlock, so let's not exit gracefully for now.
// When that is resolved, please remove the #include <unistd.h> above.
@ -179,7 +178,7 @@ int main(int argc, char** argv) {
char* fake_argv[1];
GPR_ASSERT(argc >= 1);
CHECK_GE(argc, 1);
fake_argv[0] = argv[0];
grpc::testing::TestEnvironment env(&argc, argv);
@ -226,10 +225,10 @@ int main(int argc, char** argv) {
test_server1_cert};
grpc_server_credentials* ssl_creds = grpc_ssl_server_credentials_create(
nullptr, &pem_key_cert_pair, 1, 0, nullptr);
GPR_ASSERT(grpc_server_add_http2_port(server, addr.c_str(), ssl_creds));
CHECK(grpc_server_add_http2_port(server, addr.c_str(), ssl_creds));
grpc_server_credentials_release(ssl_creds);
} else {
GPR_ASSERT(grpc_server_add_http2_port(
CHECK(grpc_server_add_http2_port(
server, addr.c_str(), grpc_insecure_server_credentials_create()));
}
@ -258,10 +257,10 @@ int main(int argc, char** argv) {
shutdown_cq = grpc_completion_queue_create_for_pluck(nullptr);
grpc_server_shutdown_and_notify(server, shutdown_cq, tag(1000));
GPR_ASSERT(grpc_completion_queue_pluck(
shutdown_cq, tag(1000),
grpc_timeout_seconds_to_deadline(5), nullptr)
.type == GRPC_OP_COMPLETE);
CHECK(grpc_completion_queue_pluck(shutdown_cq, tag(1000),
grpc_timeout_seconds_to_deadline(5),
nullptr)
.type == GRPC_OP_COMPLETE);
grpc_completion_queue_destroy(shutdown_cq);
grpc_completion_queue_shutdown(cq);
shutdown_started = 1;
@ -339,7 +338,7 @@ int main(int argc, char** argv) {
}
break;
case GRPC_QUEUE_SHUTDOWN:
GPR_ASSERT(shutdown_started);
CHECK(shutdown_started);
shutdown_finished = 1;
break;
case GRPC_QUEUE_TIMEOUT:

Write Preview
Loading…
Cancel
Save