Co::sleep return value will be the number of seconds left to sleep.

twose · twose · commit fe98c1de7a96 · 2019-01-30T19:37:50.000+08:00
diff --git a/include/coroutine.h b/include/coroutine.h
@@ -103,7 +103,7 @@ class Coroutine
     static void print_list();
 
     static long create(coroutine_func_t fn, void* args = nullptr);
-    static bool sleep(double sec);
+    static double sleep(double sec);
     static swString* read_file(const char *file, int lock);
     static ssize_t write_file(const char *file, char *buf, size_t length, int lock, int flags);
     static std::string gethostbyname(const std::string &hostname, int domain, double timeout = -1);
diff --git a/src/coroutine/base.cc b/src/coroutine/base.cc
@@ -73,7 +73,7 @@ bool Coroutine::yield(sw_coro_on_swap_t on_cancel, void *data)
     canceled = false;
     yield();
     cancelable = false;
-    if (canceled)
+    if (unlikely(canceled))
     {
         on_cancel(data);
         if (this->on_cancel)
diff --git a/src/coroutine/hook.cc b/src/coroutine/hook.cc
@@ -641,19 +641,25 @@ static void sleep_timeout_callback(swTimer *timer, swTimer_node *tnode)
     ((Coroutine *) tnode->data)->resume();
 }
 
-bool Coroutine::sleep(double sec)
+static void sleep_cancel_callback(void *data)
+{
+    swTimer_node* tnode = (swTimer_node *) data;
+    swTimer_del(&SwooleG.timer, tnode);
+}
+
+double Coroutine::sleep(double sec)
 {
     Coroutine* co = Coroutine::get_current();
     swTimer_node* tnode = swTimer_add(&SwooleG.timer, (long) (sec * 1000), 0, co, sleep_timeout_callback);
     if (unlikely(!tnode))
     {
-        return false;
+        return sec;
+    }
+    if (unlikely(!co->yield(sleep_cancel_callback, tnode)))
+    {
+        return (tnode->exec_msec - swTimer_get_relative_msec()) / 1000;
     }
-    co->yield([](void *data) {
-        swTimer_node* tnode = (swTimer_node *) data;
-        swTimer_del(&SwooleG.timer, tnode);
-    }, tnode);
-    return true;
+    return 0;
 }
 
 swString* Coroutine::read_file(const char *file, int lock)
diff --git a/src/network/timer.c b/src/network/timer.c
@@ -16,8 +16,6 @@
 
 #include "swoole.h"
 
-static int swTimer_init(long msec);
-
 int swTimer_now(struct timeval *time)
 {
 #if defined(SW_USE_MONOTONIC_TIME) && defined(CLOCK_MONOTONIC)
diff --git a/swoole_coroutine_util.cc b/swoole_coroutine_util.cc
@@ -649,12 +649,12 @@ static PHP_METHOD(swoole_coroutine_util, sleep)
         Z_PARAM_DOUBLE(seconds)
     ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
-    if (seconds <= 0)
+    if (UNEXPECTED(seconds <= 0))
     {
         swoole_php_fatal_error(E_WARNING, "Timer must be greater than 0");
         RETURN_FALSE;
     }
-    RETURN_BOOL(Coroutine::sleep(seconds));
+    RETURN_DOUBLE(Coroutine::sleep(seconds));
 }
 
 static void aio_onReadCompleted(swAio_event *event)
diff --git a/swoole_runtime.cc b/swoole_runtime.cc
@@ -1127,7 +1127,7 @@ static PHP_FUNCTION(_sleep)
     if (num >= 0.001 && PHPCoroutine::is_in())
     {
         php_swoole_check_reactor();
-        RETURN_LONG(Coroutine::sleep((double) num) ? 0 : num);
+        RETURN_LONG((long) Coroutine::sleep((double) num));
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ bool Coroutine::yield(sw_coro_on_swap_t on_cancel, void *data)`
`73`	`73`	`canceled = false;`
`74`	`74`	`yield();`
`75`	`75`	`cancelable = false;`
`76`		`- if (canceled)`
	`76`	`+ if (unlikely(canceled))`
`77`	`77`	`{`
`78`	`78`	`on_cancel(data);`
`79`	`79`	`if (this->on_cancel)`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`
`17`	`17`	`#include "swoole.h"`
`18`	`18`
`19`		`-static int swTimer_init(long msec);`
`20`		`-`
`21`	`19`	`int swTimer_now(struct timeval *time)`
`22`	`20`	`{`
`23`	`21`	`#if defined(SW_USE_MONOTONIC_TIME) && defined(CLOCK_MONOTONIC)`
Original file line number	Diff line number	Diff line change
`@@ -649,12 +649,12 @@ static PHP_METHOD(swoole_coroutine_util, sleep)`
`649`	`649`	`Z_PARAM_DOUBLE(seconds)`
`650`	`650`	`ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);`
`651`	`651`
`652`		`- if (seconds <= 0)`
	`652`	`+ if (UNEXPECTED(seconds <= 0))`
`653`	`653`	`{`
`654`	`654`	`swoole_php_fatal_error(E_WARNING, "Timer must be greater than 0");`
`655`	`655`	`RETURN_FALSE;`
`656`	`656`	`}`
`657`		`- RETURN_BOOL(Coroutine::sleep(seconds));`
	`657`	`+ RETURN_DOUBLE(Coroutine::sleep(seconds));`
`658`	`658`	`}`
`659`	`659`
`660`	`660`	`static void aio_onReadCompleted(swAio_event *event)`
Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,7 @@ static PHP_FUNCTION(_sleep)`
`1127`	`1127`	`if (num >= 0.001 && PHPCoroutine::is_in())`
`1128`	`1128`	`{`
`1129`	`1129`	`php_swoole_check_reactor();`
`1130`		`- RETURN_LONG(Coroutine::sleep((double) num) ? 0 : num);`
	`1130`	`+ RETURN_LONG((long) Coroutine::sleep((double) num));`
`1131`	`1131`	`}`
`1132`	`1132`	`else`
`1133`	`1133`	`{`