diff options
Diffstat (limited to 'src/core/iomgr/pollset_posix.c')
| -rw-r--r-- | src/core/iomgr/pollset_posix.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/iomgr/pollset_posix.c b/src/core/iomgr/pollset_posix.c index 9195344758..c325b634ae 100644 --- a/src/core/iomgr/pollset_posix.c +++ b/src/core/iomgr/pollset_posix.c @@ -100,7 +100,7 @@ static void push_front_worker(grpc_pollset *p, grpc_pollset_worker *worker) { void grpc_pollset_kick_ext(grpc_pollset *p, grpc_pollset_worker *specific_worker, - gpr_uint32 flags) { + uint32_t flags) { GPR_TIMER_BEGIN("grpc_pollset_kick_ext", 0); /* pollset->mu already held */ @@ -116,7 +116,7 @@ void grpc_pollset_kick_ext(grpc_pollset *p, p->kicked_without_pollers = 1; GPR_TIMER_END("grpc_pollset_kick_ext.broadcast", 0); } else if (gpr_tls_get(&g_current_thread_worker) != - (gpr_intptr)specific_worker) { + (intptr_t)specific_worker) { GPR_TIMER_MARK("different_thread_worker", 0); if ((flags & GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP) != 0) { specific_worker->reevaluate_polling_on_wakeup = 1; @@ -131,19 +131,18 @@ void grpc_pollset_kick_ext(grpc_pollset *p, specific_worker->kicked_specifically = 1; grpc_wakeup_fd_wakeup(&specific_worker->wakeup_fd->fd); } - } else if (gpr_tls_get(&g_current_thread_poller) != (gpr_intptr)p) { + } else if (gpr_tls_get(&g_current_thread_poller) != (intptr_t)p) { GPR_ASSERT((flags & GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP) == 0); GPR_TIMER_MARK("kick_anonymous", 0); specific_worker = pop_front_worker(p); if (specific_worker != NULL) { - if (gpr_tls_get(&g_current_thread_worker) == - (gpr_intptr)specific_worker) { + if (gpr_tls_get(&g_current_thread_worker) == (intptr_t)specific_worker) { GPR_TIMER_MARK("kick_anonymous_not_self", 0); push_back_worker(p, specific_worker); specific_worker = pop_front_worker(p); if ((flags & GRPC_POLLSET_CAN_KICK_SELF) == 0 && gpr_tls_get(&g_current_thread_worker) == - (gpr_intptr)specific_worker) { + (intptr_t)specific_worker) { push_back_worker(p, specific_worker); specific_worker = NULL; } @@ -307,9 +306,9 @@ void grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, if (!added_worker) { push_front_worker(pollset, worker); added_worker = 1; - gpr_tls_set(&g_current_thread_worker, (gpr_intptr)worker); + gpr_tls_set(&g_current_thread_worker, (intptr_t)worker); } - gpr_tls_set(&g_current_thread_poller, (gpr_intptr)pollset); + gpr_tls_set(&g_current_thread_poller, (intptr_t)pollset); GPR_TIMER_BEGIN("maybe_work_and_unlock", 0); pollset->vtable->maybe_work_and_unlock(exec_ctx, pollset, worker, deadline, now); |