diff options
| author |  Muxi Yan <mxyan@google.com> | 2018-05-21 10:53:22 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2018-05-22 08:53:49 -0700 |
| commit | 204edfbee4d2bc021dbbd9ead25b53df7a268d40 (patch) | |
| tree | 79cc5b383f3276a0285be6c050d6385aa489130c /src/core/lib/iomgr | |
| parent | c074948e499fbde2efd7a0ad62eca6665c082d83 (diff) | |
Make non-null pollset possible for cfstream
Diffstat (limited to 'src/core/lib/iomgr')
| -rw-r--r-- | src/core/lib/iomgr/polling_entity.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index fa5628dbcf..9c21e1f488 100644 --- a/src/core/lib/iomgr/polling_entity.cc +++ b/src/core/lib/iomgr/polling_entity.cc @@ -62,7 +62,9 @@ void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent, grpc_pollset_set* pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { #ifdef GRPC_CFSTREAM - GPR_ASSERT(pollent->pollent.pollset == nullptr); + if (pollent->pollent.pollset != nullptr) { + grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset); + } #else GPR_ASSERT(pollent->pollent.pollset != nullptr); grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset); @@ -80,7 +82,9 @@ void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent, grpc_pollset_set* pss_dst) { if (pollent->tag == GRPC_POLLS_POLLSET) { #ifdef GRPC_CFSTREAM - GPR_ASSERT(pollent->pollent.pollset == nullptr); + if (pollent->pollent.pollset != nullptr) { + grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset); + } #else GPR_ASSERT(pollent->pollent.pollset != nullptr); grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset); |