aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/iomgr/combiner_test.cc
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2017-11-13 15:37:58 -0800
committerGravatar Yash Tibrewal <yashkt@google.com>2017-11-14 01:36:28 -0800
commit75122c23578e24417dcf64081c737571a9fc2dbc (patch)
treef4b8491964ec0508a5826490628c9f87b82c3326 /test/core/iomgr/combiner_test.cc
parent36cd68f0d543b9024c84eff82319890a791de7f6 (diff)
Address some PR comments
Diffstat (limited to 'test/core/iomgr/combiner_test.cc')
-rw-r--r--test/core/iomgr/combiner_test.cc11
1 files changed, 3 insertions, 8 deletions
diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc
index 9fc1890c97..df8d55f1f6 100644
--- a/test/core/iomgr/combiner_test.cc
+++ b/test/core/iomgr/combiner_test.cc
@@ -30,7 +30,6 @@ static void test_no_op(void) {
gpr_log(GPR_DEBUG, "test_no_op");
ExecCtx _local_exec_ctx;
GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op");
- grpc_exec_ctx_finish();
}
static void set_event_to_true(void* value, grpc_error* error) {
@@ -47,11 +46,10 @@ static void test_execute_one(void) {
GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done,
grpc_combiner_scheduler(lock)),
GRPC_ERROR_NONE);
- grpc_exec_ctx_flush();
+ ExecCtx::Get()->Flush();
GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) !=
NULL);
GRPC_COMBINER_UNREF(lock, "test_execute_one");
- grpc_exec_ctx_finish();
}
typedef struct {
@@ -84,7 +82,7 @@ static void execute_many_loop(void* a) {
GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(
check_one, c, grpc_combiner_scheduler(args->lock)),
GRPC_ERROR_NONE);
- grpc_exec_ctx_flush();
+ ExecCtx::Get()->Flush();
}
// sleep for a little bit, to test a combiner draining and another thread
// picking it up
@@ -93,7 +91,6 @@ static void execute_many_loop(void* a) {
GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &args->done,
grpc_combiner_scheduler(args->lock)),
GRPC_ERROR_NONE);
- grpc_exec_ctx_finish();
}
static void test_execute_many(void) {
@@ -117,7 +114,6 @@ static void test_execute_many(void) {
}
ExecCtx _local_exec_ctx;
GRPC_COMBINER_UNREF(lock, "test_execute_many");
- grpc_exec_ctx_finish();
}
static gpr_event got_in_finally;
@@ -142,11 +138,10 @@ static void test_execute_finally(void) {
GRPC_CLOSURE_SCHED(
GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)),
GRPC_ERROR_NONE);
- grpc_exec_ctx_flush();
+ ExecCtx::Get()->Flush();
GPR_ASSERT(gpr_event_wait(&got_in_finally,
grpc_timeout_seconds_to_deadline(5)) != NULL);
GRPC_COMBINER_UNREF(lock, "test_execute_finally");
- grpc_exec_ctx_finish();
}
int main(int argc, char** argv) {