diff options
| author |  Yuxuan Li <yuxuanli@google.com> | 2017-05-15 14:20:32 -0700 |
|---|---|---|
| committer | Yuxuan Li <yuxuanli@google.com> | 2017-05-15 14:20:32 -0700 |
| commit | 37c2e6d79f093794eab56f24c79b3e607d36ba68 (patch) | |
| tree | 060457df5f1dba3f00e822ad2563363e714f45e6 | |
| parent | 6ca796d7ad26acc67bd5a0507682bbd74d393923 (diff) | |
| parent | 21322dec78b4c8db45a4bcd2919b4961b7d31a5c (diff) | |
fix merge
| -rw-r--r-- | src/core/lib/surface/completion_queue.c | 18 | ||||
| -rwxr-xr-x | src/objective-c/tests/run_tests.sh | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/core/lib/surface/completion_queue.c b/src/core/lib/surface/completion_queue.c index b0a4b1fbcc..172354c618 100644 --- a/src/core/lib/surface/completion_queue.c +++ b/src/core/lib/surface/completion_queue.c @@ -837,15 +837,23 @@ static grpc_event cq_next(grpc_completion_queue *cc, gpr_timespec deadline, dump_pending_tags(cc); break; } +<<<<<<< HEAD /* The main polling work happens in grpc_pollset_work */ gpr_mu_lock(cqd->mu); cqd->num_polls++; +======= + cc->num_polls++; +>>>>>>> 21322dec78b4c8db45a4bcd2919b4961b7d31a5c grpc_error *err = cc->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cc), NULL, now, iteration_deadline); gpr_mu_unlock(cqd->mu); if (err != GRPC_ERROR_NONE) { +<<<<<<< HEAD +======= + gpr_mu_unlock(cc->mu); +>>>>>>> 21322dec78b4c8db45a4bcd2919b4961b7d31a5c const char *msg = grpc_error_string(err); gpr_log(GPR_ERROR, "Completion queue next failed: %s", msg); @@ -1025,15 +1033,25 @@ static grpc_event cq_pluck(grpc_completion_queue *cc, void *tag, dump_pending_tags(cc); break; } +<<<<<<< HEAD cqd->num_polls++; +======= + cc->num_polls++; +>>>>>>> 21322dec78b4c8db45a4bcd2919b4961b7d31a5c grpc_error *err = cc->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cc), &worker, now, deadline); if (err != GRPC_ERROR_NONE) { del_plucker(cc, tag, &worker); +<<<<<<< HEAD gpr_mu_unlock(cqd->mu); const char *msg = grpc_error_string(err); gpr_log(GPR_ERROR, "Completion queue pluck failed: %s", msg); +======= + gpr_mu_unlock(cc->mu); + const char *msg = grpc_error_string(err); + gpr_log(GPR_ERROR, "Completion queue next failed: %s", msg); +>>>>>>> 21322dec78b4c8db45a4bcd2919b4961b7d31a5c GRPC_ERROR_UNREF(err); memset(&ret, 0, sizeof(ret)); diff --git a/src/objective-c/tests/run_tests.sh b/src/objective-c/tests/run_tests.sh index 021188dd23..2432209f4f 100755 --- a/src/objective-c/tests/run_tests.sh +++ b/src/objective-c/tests/run_tests.sh @@ -69,7 +69,7 @@ xcodebuild \ -workspace Tests.xcworkspace \ -scheme CoreCronetEnd2EndTests \ -destination name="iPhone 6" \ - test + test | xcpretty # Temporarily disabled for (possible) flakiness on Jenkins. # Fix or reenable after confirmation/disconfirmation that it is the source of |