diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-28 10:16:06 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-28 10:16:06 -0700 |
| commit | 69684061dae3552e45befd19c46e77dd6412a660 (patch) | |
| tree | afa79d4bff73195508174ae265d7736d2e833dfd /src/core/iomgr/pollset_posix.c | |
| parent | 34522cdac57135f9c933708aff61f96d4923a74e (diff) | |
| parent | d3366d7ff05de14b4d1c6d75f674b5fdd1dd07dd (diff) | |
Merge github.com:grpc/grpc into mergabit
Diffstat (limited to 'src/core/iomgr/pollset_posix.c')
| -rw-r--r-- | src/core/iomgr/pollset_posix.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 43ad22c16d..10bab134d7 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -47,6 +47,7 @@ #include "src/core/iomgr/iomgr_internal.h" #include "src/core/iomgr/socket_utils_posix.h" #include "src/core/profiling/timers.h" +#include "src/core/support/block_annotate.h" #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/thd.h> @@ -468,7 +469,9 @@ static void basic_pollset_maybe_work_and_unlock(grpc_exec_ctx *exec_ctx, /* poll fd count (argument 2) is shortened by one if we have no events to poll on - such that it only includes the kicker */ + GRPC_SCHEDULING_START_BLOCKING_REGION; r = grpc_poll_function(pfd, nfds, timeout); + GRPC_SCHEDULING_END_BLOCKING_REGION; GRPC_TIMER_MARK(GRPC_PTAG_POLL_FINISHED, r); if (fd) { |