aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILDING.md3
-rw-r--r--src/core/lib/iomgr/exec_ctx.cc6
-rw-r--r--src/core/lib/iomgr/exec_ctx.h2
-rw-r--r--src/core/lib/iomgr/timer.h5
-rw-r--r--src/core/lib/transport/service_config.cc4
-rw-r--r--src/core/lib/transport/service_config.h6
-rw-r--r--src/python/grpcio_tests/tests/unit/_channel_args_test.py5
-rw-r--r--test/core/iomgr/timer_list_test.cc115
8 files changed, 129 insertions, 17 deletions
diff --git a/BUILDING.md b/BUILDING.md
index e408402a76..81edb68e43 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -103,6 +103,9 @@ repository at the latest stable version.
In the C++ world, there's no "standard" build system that would work for in all supported use cases and on all supported platforms.
Therefore, gRPC supports several major build systems, which should satisfy most users.
+Note that this section only covers the build of gRPC itself, not the installation. See the [How to use](https://github.com/grpc/grpc/tree/master/src/cpp#to-start-using-grpc-c) instructions
+for guidance on how to add gRPC as a dependency to a C++ application (there are several ways and system wide installation is often not the best choice).
+
## make (on UNIX systems)
From the grpc repository root
diff --git a/src/core/lib/iomgr/exec_ctx.cc b/src/core/lib/iomgr/exec_ctx.cc
index 5d5c355ff9..d68fa0714b 100644
--- a/src/core/lib/iomgr/exec_ctx.cc
+++ b/src/core/lib/iomgr/exec_ctx.cc
@@ -109,6 +109,12 @@ grpc_closure_scheduler* grpc_schedule_on_exec_ctx = &exec_ctx_scheduler;
namespace grpc_core {
GPR_TLS_CLASS_DEF(ExecCtx::exec_ctx_);
+// WARNING: for testing purposes only!
+void ExecCtx::TestOnlyGlobalInit(gpr_timespec new_val) {
+ g_start_time = new_val;
+ gpr_tls_init(&exec_ctx_);
+}
+
void ExecCtx::GlobalInit(void) {
g_start_time = gpr_now(GPR_CLOCK_MONOTONIC);
gpr_tls_init(&exec_ctx_);
diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h
index 8ddab0d381..f3528d527a 100644
--- a/src/core/lib/iomgr/exec_ctx.h
+++ b/src/core/lib/iomgr/exec_ctx.h
@@ -192,6 +192,8 @@ class ExecCtx {
now_is_valid_ = true;
}
+ static void TestOnlyGlobalInit(gpr_timespec new_val);
+
/** Global initialization for ExecCtx. Called by iomgr. */
static void GlobalInit(void);
diff --git a/src/core/lib/iomgr/timer.h b/src/core/lib/iomgr/timer.h
index 7f534476df..17e933b865 100644
--- a/src/core/lib/iomgr/timer.h
+++ b/src/core/lib/iomgr/timer.h
@@ -61,10 +61,11 @@ typedef struct grpc_timer_vtable {
/* Initialize *timer. When expired or canceled, closure will be called with
error set to indicate if it expired (GRPC_ERROR_NONE) or was canceled
- (GRPC_ERROR_CANCELLED). timer_cb is guaranteed to be called exactly once, and
+ (GRPC_ERROR_CANCELLED). *closure is guaranteed to be called exactly once, and
application code should check the error to determine how it was invoked. The
application callback is also responsible for maintaining information about
- when to free up any user-level state. */
+ when to free up any user-level state. Behavior is undefined for a deadline of
+ GRPC_MILLIS_INF_FUTURE. */
void grpc_timer_init(grpc_timer* timer, grpc_millis deadline,
grpc_closure* closure);
diff --git a/src/core/lib/transport/service_config.cc b/src/core/lib/transport/service_config.cc
index e1a55d98ab..405e336028 100644
--- a/src/core/lib/transport/service_config.cc
+++ b/src/core/lib/transport/service_config.cc
@@ -65,8 +65,8 @@ const char* ServiceConfig::GetLoadBalancingPolicyName() const {
return lb_policy_name;
}
-size_t ServiceConfig::CountNamesInMethodConfig(grpc_json* json) {
- size_t num_names = 0;
+int ServiceConfig::CountNamesInMethodConfig(grpc_json* json) {
+ int num_names = 0;
for (grpc_json* field = json->child; field != nullptr; field = field->next) {
if (field->key != nullptr && strcmp(field->key, "name") == 0) {
if (field->type != GRPC_JSON_ARRAY) return -1;
diff --git a/src/core/lib/transport/service_config.h b/src/core/lib/transport/service_config.h
index a65b267d46..2c0dd75845 100644
--- a/src/core/lib/transport/service_config.h
+++ b/src/core/lib/transport/service_config.h
@@ -103,7 +103,7 @@ class ServiceConfig {
ServiceConfig(UniquePtr<char> json_string, grpc_json* json_tree);
// Returns the number of names specified in the method config \a json.
- static size_t CountNamesInMethodConfig(grpc_json* json);
+ static int CountNamesInMethodConfig(grpc_json* json);
// Returns a path string for the JSON name object specified by \a json.
// Returns null on error.
@@ -188,9 +188,9 @@ ServiceConfig::CreateMethodConfigTable(CreateValue<T> create_value) {
// Find number of entries.
for (grpc_json* method = field->child; method != nullptr;
method = method->next) {
- size_t count = CountNamesInMethodConfig(method);
+ int count = CountNamesInMethodConfig(method);
if (count <= 0) return nullptr;
- num_entries += count;
+ num_entries += static_cast<size_t>(count);
}
// Populate method config table entries.
entries = static_cast<typename SliceHashTable<RefCountedPtr<T>>::Entry*>(
diff --git a/src/python/grpcio_tests/tests/unit/_channel_args_test.py b/src/python/grpcio_tests/tests/unit/_channel_args_test.py
index 1a2d2c0117..869c2f4d2f 100644
--- a/src/python/grpcio_tests/tests/unit/_channel_args_test.py
+++ b/src/python/grpcio_tests/tests/unit/_channel_args_test.py
@@ -13,6 +13,7 @@
# limitations under the License.
"""Tests of Channel Args on client/server side."""
+from concurrent import futures
import unittest
import grpc
@@ -39,7 +40,9 @@ class ChannelArgsTest(unittest.TestCase):
grpc.insecure_channel('localhost:8080', options=TEST_CHANNEL_ARGS)
def test_server(self):
- grpc.server(None, options=TEST_CHANNEL_ARGS)
+ grpc.server(
+ futures.ThreadPoolExecutor(max_workers=1),
+ options=TEST_CHANNEL_ARGS)
if __name__ == '__main__':
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index b1d919b292..feedf3f149 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -38,6 +38,8 @@ extern grpc_core::TraceFlag grpc_timer_trace;
extern grpc_core::TraceFlag grpc_timer_check_trace;
static int cb_called[MAX_CB][2];
+static const int64_t kMillisIn25Days = 2160000000;
+static const int64_t kHoursIn25Days = 600;
static void cb(void* arg, grpc_error* error) {
cb_called[(intptr_t)arg][error == GRPC_ERROR_NONE]++;
@@ -151,17 +153,112 @@ void destruction_test(void) {
GPR_ASSERT(1 == cb_called[2][0]);
}
-int main(int argc, char** argv) {
- grpc_test_init(argc, argv);
- grpc_core::ExecCtx::GlobalInit();
+/* Cleans up a list with pending timers that simulate long-running-services.
+ This test does the following:
+ 1) Simulates grpc server start time to 25 days in the past (completed in
+ `main` using TestOnlyGlobalInit())
+ 2) Creates 4 timers - one with a deadline 25 days in the future, one just
+ 3 milliseconds in future, one way out in the future, and one using the
+ grpc_timespec_to_millis_round_up function to compute a deadline of 25
+ days in the future
+ 3) Simulates 4 milliseconds of elapsed time by changing `now` (cached at
+ step 1) to `now+4`
+ 4) Shuts down the timer list
+ https://github.com/grpc/grpc/issues/15904 */
+void long_running_service_cleanup_test(void) {
+ grpc_timer timers[4];
grpc_core::ExecCtx exec_ctx;
- grpc_determine_iomgr_platform();
- grpc_iomgr_platform_init();
- gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG);
- add_test();
- destruction_test();
- grpc_iomgr_platform_shutdown();
+
+ gpr_log(GPR_INFO, "long_running_service_cleanup_test");
+
+ grpc_millis now = grpc_core::ExecCtx::Get()->Now();
+ GPR_ASSERT(now >= kMillisIn25Days);
+ grpc_timer_list_init();
+ grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace);
+ grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace);
+ memset(cb_called, 0, sizeof(cb_called));
+
+ grpc_timer_init(
+ &timers[0], now + kMillisIn25Days,
+ GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)0, grpc_schedule_on_exec_ctx));
+ grpc_timer_init(
+ &timers[1], now + 3,
+ GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)1, grpc_schedule_on_exec_ctx));
+ grpc_timer_init(
+ &timers[2], GRPC_MILLIS_INF_FUTURE - 1,
+ GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)2, grpc_schedule_on_exec_ctx));
+
+ gpr_timespec deadline_spec = grpc_millis_to_timespec(
+ now + kMillisIn25Days, gpr_clock_type::GPR_CLOCK_MONOTONIC);
+
+ /* grpc_timespec_to_millis_round_up is how users usually compute a millisecond
+ input value into grpc_timer_init, so we mimic that behavior here */
+ grpc_timer_init(
+ &timers[3], grpc_timespec_to_millis_round_up(deadline_spec),
+ GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)3, grpc_schedule_on_exec_ctx));
+
+ grpc_core::ExecCtx::Get()->TestOnlySetNow(now + 4);
+ GPR_ASSERT(grpc_timer_check(nullptr) == GRPC_TIMERS_FIRED);
+ grpc_core::ExecCtx::Get()->Flush();
+ GPR_ASSERT(0 == cb_called[0][0]); // Timer 0 not called
+ GPR_ASSERT(0 == cb_called[0][1]);
+ GPR_ASSERT(0 == cb_called[1][0]);
+ GPR_ASSERT(1 == cb_called[1][1]); // Timer 1 fired
+ GPR_ASSERT(0 == cb_called[2][0]); // Timer 2 not called
+ GPR_ASSERT(0 == cb_called[2][1]);
+ GPR_ASSERT(0 == cb_called[3][0]); // Timer 3 not called
+ GPR_ASSERT(0 == cb_called[3][1]);
+
+ grpc_timer_list_shutdown();
+ grpc_core::ExecCtx::Get()->Flush();
+ /* Timers 0, 2, and 3 were fired with an error during cleanup */
+ GPR_ASSERT(1 == cb_called[0][0]);
+ GPR_ASSERT(0 == cb_called[1][0]);
+ GPR_ASSERT(1 == cb_called[2][0]);
+ GPR_ASSERT(1 == cb_called[3][0]);
+}
+
+int main(int argc, char** argv) {
+ /* Tests with default g_start_time */
+ {
+ grpc_test_init(argc, argv);
+ grpc_core::ExecCtx::GlobalInit();
+ grpc_core::ExecCtx exec_ctx;
+ grpc_determine_iomgr_platform();
+ grpc_iomgr_platform_init();
+ gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG);
+ add_test();
+ destruction_test();
+ grpc_iomgr_platform_shutdown();
+ }
grpc_core::ExecCtx::GlobalShutdown();
+
+ /* Begin long running service tests */
+ {
+ grpc_test_init(argc, argv);
+ /* Set g_start_time back 25 days. */
+ /* We set g_start_time here in case there are any initialization
+ dependencies that use g_start_time. */
+ gpr_timespec new_start =
+ gpr_time_sub(gpr_now(gpr_clock_type::GPR_CLOCK_MONOTONIC),
+ gpr_time_from_hours(kHoursIn25Days,
+ gpr_clock_type::GPR_CLOCK_MONOTONIC));
+ grpc_core::ExecCtx::TestOnlyGlobalInit(new_start);
+ grpc_core::ExecCtx exec_ctx;
+ grpc_determine_iomgr_platform();
+ grpc_iomgr_platform_init();
+ gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG);
+#ifndef GPR_WINDOWS
+ /* Skip this test on Windows until we figure out why it fails */
+ /* https://github.com/grpc/grpc/issues/16417 */
+ long_running_service_cleanup_test();
+#endif // GPR_WINDOWS
+ add_test();
+ destruction_test();
+ grpc_iomgr_platform_shutdown();
+ }
+ grpc_core::ExecCtx::GlobalShutdown();
+
return 0;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 14:00:05 +0000