Fix the bug of the channel, the data that has enqueue cannot be popped after the close

Author: matyhtf

ext-src/swoole_channel_coro.cc

@@ -167,14 +167,6 @@ static PHP_METHOD(swoole_channel_coro, __construct) {
 
 static PHP_METHOD(swoole_channel_coro, push) {
     Channel *chan = php_swoole_get_channel(ZEND_THIS);
-    if (chan->is_closed()) {
-        zend_update_property_long(
-            swoole_channel_coro_ce, SW_Z8_OBJ_P(ZEND_THIS), ZEND_STRL("errCode"), SW_CHANNEL_CLOSED);
-        RETURN_FALSE;
-    } else {
-        zend_update_property_long(swoole_channel_coro_ce, SW_Z8_OBJ_P(ZEND_THIS), ZEND_STRL("errCode"), SW_CHANNEL_OK);
-    }
-
     zval *zdata;
     double timeout = -1;
 
@@ -187,6 +179,7 @@ static PHP_METHOD(swoole_channel_coro, push) {
     Z_TRY_ADDREF_P(zdata);
     zdata = sw_zval_dup(zdata);
     if (chan->push(zdata, timeout)) {
+        zend_update_property_long(swoole_channel_coro_ce, SW_Z8_OBJ_P(ZEND_THIS), ZEND_STRL("errCode"), SW_CHANNEL_OK);
         RETURN_TRUE;
     } else {
         zend_update_property_long(swoole_channel_coro_ce,
@@ -201,14 +194,6 @@ static PHP_METHOD(swoole_channel_coro, push) {
 
 static PHP_METHOD(swoole_channel_coro, pop) {
     Channel *chan = php_swoole_get_channel(ZEND_THIS);
-    if (chan->is_closed()) {
-        zend_update_property_long(
-            swoole_channel_coro_ce, SW_Z8_OBJ_P(ZEND_THIS), ZEND_STRL("errCode"), SW_CHANNEL_CLOSED);
-        RETURN_FALSE;
-    } else {
-        zend_update_property_long(swoole_channel_coro_ce, SW_Z8_OBJ_P(ZEND_THIS), ZEND_STRL("errCode"), SW_CHANNEL_OK);
-    }
-
     double timeout = -1;
 
     ZEND_PARSE_PARAMETERS_START_EX(ZEND_PARSE_PARAMS_THROW, 0, 1)
@@ -220,6 +205,7 @@ static PHP_METHOD(swoole_channel_coro, pop) {
     if (zdata) {
         RETVAL_ZVAL(zdata, 0, 0);
         efree(zdata);
+        zend_update_property_long(swoole_channel_coro_ce, SW_Z8_OBJ_P(ZEND_THIS), ZEND_STRL("errCode"), SW_CHANNEL_OK);
     } else {
         zend_update_property_long(swoole_channel_coro_ce,
                                   SW_Z8_OBJ_P(ZEND_THIS),

src/coroutine/channel.cc

@@ -47,7 +47,7 @@ void Channel::yield(enum opcode type) {
 
 void *Channel::pop(double timeout) {
     Coroutine *current_co = Coroutine::get_current_safe();
-    if (closed) {
+    if (closed && is_empty()) {
         return nullptr;
     }
     if (is_empty() || !consumer_queue.empty()) {
@@ -67,7 +67,7 @@ void *Channel::pop(double timeout) {
         if (msg.timer) {
             swoole_timer_del(msg.timer);
         }
-        if (msg.error || closed) {
+        if (msg.error || (closed && is_empty())) {
             return nullptr;
         }
     }

tests/swoole_channel_coro/pop_after_close.phpt

@@ -0,0 +1,43 @@
+--TEST--
+swoole_channel_coro: pop after close
+--SKIPIF--
+<?php require __DIR__ . '/../include/skipif.inc'; ?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+use Swoole\Coroutine\Channel;
+
+use function Swoole\Coroutine\run;
+
+run(function () {
+    $chan = new Channel();
+
+    go(function () use ($chan) {
+        for ($i = 1; $i <= 3; $i++) {
+            if ($chan->push($i)) {
+                echo "push ok\n";
+            }
+        }
+        $chan->close();
+    });
+
+    go(function () use ($chan) {
+        while (true) {
+            $data = $chan->pop();
+            var_dump($data);
+            if (!$data) {
+                break;
+            }
+        }
+    });
+});
+?>
+--EXPECT--
+push ok
+push ok
+int(1)
+push ok
+int(2)
+int(3)
+bool(false)