diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-08 11:45:11 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-08 11:45:11 -0700 |
| commit | fabb513fe4b8b654c8cd58c6cc8189324ca8d402 (patch) | |
| tree | 55956e37bec5aecfd734949231c2076f17dcc7f2 /test/core/surface | |
| parent | da8a16992823201fb68685ffdc2b433719d03fed (diff) | |
| parent | 24ea59b31de83fadced949a558b8eda44c3bff35 (diff) | |
Merge
Diffstat (limited to 'test/core/surface')
| -rw-r--r-- | test/core/surface/alarm_test.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/test/core/surface/alarm_test.c b/test/core/surface/alarm_test.c index 6971d92074..4fd7cb93c6 100644 --- a/test/core/surface/alarm_test.c +++ b/test/core/surface/alarm_test.c @@ -48,45 +48,50 @@ static void test_alarm(void) { /* regular expiry */ grpc_event ev; void *tag = create_test_tag(); - grpc_alarm *alarm = - grpc_alarm_create(cc, grpc_timeout_seconds_to_deadline(1), tag); + grpc_alarm *alarm = grpc_alarm_create(NULL); + grpc_alarm_set(alarm, cc, grpc_timeout_seconds_to_deadline(1), tag, NULL); ev = grpc_completion_queue_next(cc, grpc_timeout_seconds_to_deadline(2), NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); GPR_ASSERT(ev.tag == tag); GPR_ASSERT(ev.success); - grpc_alarm_destroy(alarm); + grpc_alarm_destroy(alarm, NULL); } { /* cancellation */ grpc_event ev; void *tag = create_test_tag(); - grpc_alarm *alarm = - grpc_alarm_create(cc, grpc_timeout_seconds_to_deadline(2), tag); + grpc_alarm *alarm = grpc_alarm_create(NULL); + grpc_alarm_set(alarm, cc, grpc_timeout_seconds_to_deadline(2), tag, NULL); - grpc_alarm_cancel(alarm); + grpc_alarm_cancel(alarm, NULL); ev = grpc_completion_queue_next(cc, grpc_timeout_seconds_to_deadline(1), NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); GPR_ASSERT(ev.tag == tag); GPR_ASSERT(ev.success == 0); - grpc_alarm_destroy(alarm); + grpc_alarm_destroy(alarm, NULL); } { /* alarm_destroy before cq_next */ grpc_event ev; void *tag = create_test_tag(); - grpc_alarm *alarm = - grpc_alarm_create(cc, grpc_timeout_seconds_to_deadline(2), tag); + grpc_alarm *alarm = grpc_alarm_create(NULL); + grpc_alarm_set(alarm, cc, grpc_timeout_seconds_to_deadline(2), tag, NULL); - grpc_alarm_destroy(alarm); + grpc_alarm_destroy(alarm, NULL); ev = grpc_completion_queue_next(cc, grpc_timeout_seconds_to_deadline(1), NULL); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); GPR_ASSERT(ev.tag == tag); GPR_ASSERT(ev.success == 0); } + { + /* alarm_destroy before set */ + grpc_alarm *alarm = grpc_alarm_create(NULL); + grpc_alarm_destroy(alarm, NULL); + } shutdown_and_destroy(cc); } |