improve runjobs tips

2 files changed, 25 insertions, 0 deletions

diff --git a/xmake/core/base/scheduler.lua b/xmake/core/base/scheduler.lua
index b1091caf6..5e68be8c2 100644
--- a/xmake/core/base/scheduler.lua
+++ b/xmake/core/base/scheduler.lua
@@ -52,6 +52,16 @@ function _coroutine:name_set(name)
     self._NAME = name
 end
 
+-- get the waiting poller object
+function _coroutine:waitobj()
+    return self._WAITOBJ
+end
+
+-- set the waiting poller object
+function _coroutine:waitobj_set(obj)
+    self._WAITOBJ = obj
+end
+
 -- get the raw coroutine thread 
 function _coroutine:thread()
     return self._THREAD
@@ -146,6 +156,7 @@ function scheduler:_poller_resume_co(co, events)
     assert(co:is_suspended())
 
     -- resume this coroutine task
+    co:waitobj_set(nil)
     self:_co_tasks_suspended():remove(co)
     return self:co_resume(co, (bit.band(events, poller.EV_POLLER_ERROR) ~= 0) and -1 or events)
 end
@@ -550,6 +561,7 @@ function scheduler:poller_wait(obj, events, timeout)
     if timeout > 0 then
         timer_task = self:_timer():post(function (cancel) 
             if not cancel and running:is_suspended() then
+                running:waitobj_set(nil)
                 self:_co_tasks_suspended():remove(running)
                 self:co_resume(running, 0)
             end
@@ -572,6 +584,9 @@ function scheduler:poller_wait(obj, events, timeout)
     -- save the suspended coroutine
     self:_co_tasks_suspended():insert(running)
 
+    -- save the waiting poller object
+    running:waitobj_set(obj)
+
     -- wait
     return self:co_suspend()
 end
@@ -621,6 +636,7 @@ function scheduler:poller_waitproc(obj, timeout)
         timer_task = self:_timer():post(function (cancel) 
             if not cancel and running:is_suspended() then
                 pollerdata.co_waiting = nil
+                running:waitobj_set(nil)
                 self:_co_tasks_suspended():remove(running)
                 self:co_resume(running, 0)
             end
@@ -636,6 +652,9 @@ function scheduler:poller_waitproc(obj, timeout)
     -- save the suspended coroutine
     self:_co_tasks_suspended():insert(running)
 
+    -- save the waiting poller object
+    running:waitobj_set(obj)
+
     -- wait
     local ok = self:co_suspend()
     return ok, pollerdata.proc_status
diff --git a/xmake/core/sandbox/modules/import/core/base/scheduler.lua b/xmake/core/sandbox/modules/import/core/base/scheduler.lua
index c899fcd34..254f78591 100644
--- a/xmake/core/sandbox/modules/import/core/base/scheduler.lua
+++ b/xmake/core/sandbox/modules/import/core/base/scheduler.lua
@@ -22,9 +22,15 @@
 local sandbox_core_base_scheduler = sandbox_core_base_scheduler or {}
 
 -- load modules
+local poller    = require("base/poller")
 local scheduler = require("base/scheduler")
 local raise     = require("sandbox/modules/raise")
 
+-- the poller object type
+sandbox_core_base_scheduler.OT_SOCK = poller.OT_SOCK
+sandbox_core_base_scheduler.OT_PIPE = poller.OT_PIPE
+sandbox_core_base_scheduler.OT_PROC = poller.OT_PROC
+
 -- start a new coroutine task 
 function sandbox_core_base_scheduler.co_start(cotask, ...)
     local co, errors = scheduler:co_start(cotask, ...)