diff options
| author |  ctiller <ctiller@google.com> | 2014-12-15 13:02:10 -0800 |
|---|---|---|
| committer |  Michael Lumish <mlumish@google.com> | 2014-12-15 14:46:23 -0800 |
| commit | c5abe59fe1bd72f7478f0f865daec1474f3865dc (patch) | |
| tree | 21a210c52ae9627cb6ddf2f4f6cbe1fd4b0eebf9 /test | |
| parent | 64f291008acb2cd806e654ef802f8da72601a15d (diff) | |
Simplify alarm API.
This change removes a corner case that needs to be handled (what happens if you
add an alarm twice?). This corner case was never used, nor tested.
Change on 2014/12/15 by ctiller <ctiller@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82168179
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/iomgr/alarm_test.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/core/iomgr/alarm_test.c b/test/core/iomgr/alarm_test.c index 0dcd21463d..afc0768d99 100644 --- a/test/core/iomgr/alarm_test.c +++ b/test/core/iomgr/alarm_test.c @@ -116,8 +116,7 @@ static void test_grpc_alarm() { gpr_cv_init(&arg.cv); gpr_event_init(&arg.fcb_arg); - grpc_alarm_init(&alarm, alarm_cb, &arg); - grpc_alarm_add(&alarm, gpr_time_add(tv0, gpr_now())); + grpc_alarm_init(&alarm, gpr_time_add(tv0, gpr_now()), alarm_cb, &arg); alarm_deadline = gpr_time_add(gpr_now(), tv1); gpr_mu_lock(&arg.mu); @@ -162,8 +161,8 @@ static void test_grpc_alarm() { gpr_cv_init(&arg2.cv); gpr_event_init(&arg2.fcb_arg); - grpc_alarm_init(&alarm_to_cancel, alarm_cb, &arg2); - grpc_alarm_add(&alarm_to_cancel, gpr_time_add(tv2, gpr_now())); + grpc_alarm_init(&alarm_to_cancel, gpr_time_add(tv2, gpr_now()), alarm_cb, + &arg2); grpc_alarm_cancel(&alarm_to_cancel); alarm_deadline = gpr_time_add(gpr_now(), tv1); |