add mysql::prepare defer support

matyhtf · matyhtf · commit 58c94a9d2550 · 2018-04-27T10:50:20.000+08:00
diff --git a/swoole_mysql.h b/swoole_mysql.h
@@ -275,7 +275,7 @@ typedef struct _mysql_client
 {
 #ifdef SW_COROUTINE
     zend_bool defer;
-    zend_bool defer_yield;
+    zend_bool suspending;
     mysql_io_status iowait;
     zval *result;
     int cid;
diff --git a/swoole_mysql_coro.c b/swoole_mysql_coro.c
@@ -883,7 +883,7 @@ static PHP_METHOD(swoole_mysql_coro, recv)
 		RETURN_FALSE;
 	}
 
-    client->defer_yield = 1;
+    client->suspending = 1;
     client->cid = get_current_cid();
 	php_context *context = swoole_get_property(getThis(), 0);
     coro_save(context);
@@ -937,19 +937,24 @@ static PHP_METHOD(swoole_mysql_coro, prepare)
         }
         RETURN_FALSE;
     }
-    else
+
+    if (client->defer)
     {
-        client->state = SW_MYSQL_STATE_READ_START;
-        php_context *context = swoole_get_property(getThis(), 0);
-        double timeout = client->connector.timeout;
-        if (timeout > 0)
-        {
-            client->timer = SwooleG.timer.add(&SwooleG.timer, (int) (timeout * 1000), 0, context, swoole_mysql_coro_onTimeout);
-        }
-        client->cid = get_current_cid();
-        coro_save(context);
-        coro_yield();
+        client->iowait = SW_MYSQL_CORO_STATUS_WAIT;
+        RETURN_TRUE;
+    }
+
+    client->state = SW_MYSQL_STATE_READ_START;
+    php_context *context = swoole_get_property(getThis(), 0);
+    double timeout = client->connector.timeout;
+    if (timeout > 0)
+    {
+        client->timer = SwooleG.timer.add(&SwooleG.timer, (int) (timeout * 1000), 0, context, swoole_mysql_coro_onTimeout);
     }
+    client->suspending = 1;
+    client->cid = get_current_cid();
+    coro_save(context);
+    coro_yield();
 }
 
 static PHP_METHOD(swoole_mysql_coro_statement, execute)
@@ -994,7 +999,7 @@ static PHP_METHOD(swoole_mysql_coro_statement, execute)
         client->iowait = SW_MYSQL_CORO_STATUS_WAIT;
         RETURN_TRUE;
     }
-    client->defer_yield = 1;
+    client->suspending = 1;
     client->cid = get_current_cid();
     coro_save(context);
     coro_yield();
@@ -1128,12 +1133,12 @@ static int swoole_mysql_coro_onError(swReactor *reactor, swEvent *event)
 	zend_update_property_string(swoole_mysql_coro_class_entry_ptr, zobject, ZEND_STRL("connect_error"), "EPOLLERR/EPOLLHUP/EPOLLRDHUP happen!" TSRMLS_CC);
 	zend_update_property_long(swoole_mysql_coro_class_entry_ptr, zobject, ZEND_STRL("connect_errno"), 104 TSRMLS_CC);
     ZVAL_BOOL(result, 0);
-	if (client->defer && !client->defer_yield)
+	if (client->defer && !client->suspending)
 	{
 		client->result = result;
 		return SW_OK;
 	}
-    client->defer_yield = 0;
+    client->suspending = 0;
     client->cid = 0;
 	php_context *sw_current_context = swoole_get_property(zobject, 0);
 	int ret = coro_resume(sw_current_context, result, &retval);
@@ -1229,12 +1234,12 @@ static void swoole_mysql_coro_onTimeout(swTimer *timer, swTimer_node *tnode)
 	client->state = SW_MYSQL_STATE_QUERY;
     swoole_mysql_coro_close(zobject);
 
-    if (client->defer && !client->defer_yield)
+    if (client->defer && !client->suspending)
     {
         client->result = result;
         return;
     }
-    client->defer_yield = 0;
+    client->suspending = 0;
     client->cid = 0;
 
     int ret = coro_resume(ctx, result, &retval);
@@ -1423,13 +1428,13 @@ static int swoole_mysql_coro_onRead(swReactor *reactor, swEvent *event)
 
             SW_ALLOC_INIT_ZVAL(result);
             ZVAL_BOOL(result, 0);
-            if (client->defer && !client->defer_yield)
+            if (client->defer && !client->suspending)
             {
                 client->iowait = SW_MYSQL_CORO_STATUS_DONE;
                 client->result = result;
                 return SW_OK;
             }
-            client->defer_yield = 0;
+            client->suspending = 0;
             if (!client->cid)
             {
                 return SW_OK;
@@ -1529,13 +1534,13 @@ static int swoole_mysql_coro_onRead(swReactor *reactor, swEvent *event)
 
             swString_clear(client->buffer);
             bzero(&client->response, sizeof(client->response));
-            if (client->defer && !client->defer_yield)
+            if (client->defer && !client->suspending)
             {
                 client->iowait = SW_MYSQL_CORO_STATUS_DONE;
                 client->result = result;
                 return SW_OK;
             }
-            client->defer_yield = 0;
+            client->suspending = 0;
             client->iowait = SW_MYSQL_CORO_STATUS_READY;
             client->cid = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ typedef struct _mysql_client`
`275`	`275`	`{`
`276`	`276`	`#ifdef SW_COROUTINE`
`277`	`277`	`zend_bool defer;`
`278`		`- zend_bool defer_yield;`
	`278`	`+ zend_bool suspending;`
`279`	`279`	`mysql_io_status iowait;`
`280`	`280`	`zval *result;`
`281`	`281`	`int cid;`