Skip to content
Snippets Groups Projects
Commit 477538d2 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge pull request #3101 from yang-g/string_ref_auth

Use millis instead of micros in seconds_timeout and reduce a large deadline.
parents 89d56103 cf44bb50
No related branches found
No related tags found
No related merge requests found
...@@ -135,7 +135,7 @@ static void test_receive(int number_of_clients) { ...@@ -135,7 +135,7 @@ static void test_receive(int number_of_clients) {
gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset));
for (i = 0; i < number_of_clients; i++) { for (i = 0; i < number_of_clients; i++) {
deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(4000); deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(10);
number_of_reads_before = g_number_of_reads; number_of_reads_before = g_number_of_reads;
/* Create a socket, send a packet to the UDP server. */ /* Create a socket, send a packet to the UDP server. */
......
...@@ -56,7 +56,7 @@ extern double g_fixture_slowdown_factor; ...@@ -56,7 +56,7 @@ extern double g_fixture_slowdown_factor;
#define GRPC_TIMEOUT_SECONDS_TO_DEADLINE(x) \ #define GRPC_TIMEOUT_SECONDS_TO_DEADLINE(x) \
gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), \ gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), \
gpr_time_from_micros(GRPC_TEST_SLOWDOWN_FACTOR * 1e6 * (x), \ gpr_time_from_millis(GRPC_TEST_SLOWDOWN_FACTOR * 1e3 * (x), \
GPR_TIMESPAN)) GPR_TIMESPAN))
#define GRPC_TIMEOUT_MILLIS_TO_DEADLINE(x) \ #define GRPC_TIMEOUT_MILLIS_TO_DEADLINE(x) \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment