diff options
author | 2015-07-13 10:10:31 -0700 | |
---|---|---|
committer | 2015-07-13 10:10:31 -0700 | |
commit | cc44ee50e467a956994a9d283084f40ccbd04a02 (patch) | |
tree | f45bad885a001ad2b39197284fc2e10aae4dc42d /test/core/iomgr/alarm_test.c | |
parent | 53132db4a46aaf93a6aef4dd73cd27250b836d6b (diff) | |
parent | 4d0b7427faecfdbb1635c2ab158c922d7511b865 (diff) |
Merge github.com:grpc/grpc into flow-like-lava-to-a-barnyard
Diffstat (limited to 'test/core/iomgr/alarm_test.c')
-rw-r--r-- | test/core/iomgr/alarm_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/iomgr/alarm_test.c b/test/core/iomgr/alarm_test.c index 0ccec435e6..362eb5fe63 100644 --- a/test/core/iomgr/alarm_test.c +++ b/test/core/iomgr/alarm_test.c @@ -113,7 +113,7 @@ static void test_grpc_alarm(void) { gpr_event_init(&arg.fcb_arg); grpc_alarm_init(&alarm, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), alarm_cb, &arg, - gpr_now()); + gpr_now(GPR_CLOCK_REALTIME)); alarm_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); gpr_mu_lock(&arg.mu); @@ -165,7 +165,7 @@ static void test_grpc_alarm(void) { gpr_event_init(&arg2.fcb_arg); grpc_alarm_init(&alarm_to_cancel, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), - alarm_cb, &arg2, gpr_now()); + alarm_cb, &arg2, gpr_now(GPR_CLOCK_REALTIME)); grpc_alarm_cancel(&alarm_to_cancel); alarm_deadline = GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1); |