From 204edfbee4d2bc021dbbd9ead25b53df7a268d40 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Mon, 21 May 2018 10:53:22 -0700 Subject: [PATCH] Make non-null pollset possible for cfstream --- src/core/lib/iomgr/polling_entity.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/core/lib/iomgr/polling_entity.cc b/src/core/lib/iomgr/polling_entity.cc index fa5628dbcff..9c21e1f488b 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);