improve lock

1 files changed, 12 insertions, 5 deletions

diff --git a/xmake/core/base/scheduler.lua b/xmake/core/base/scheduler.lua
index ece889cfe..ab2d349d6 100644
--- a/xmake/core/base/scheduler.lua
+++ b/xmake/core/base/scheduler.lua
@@ -519,18 +519,20 @@ function scheduler:co_lock(lockname)
         co_locked_tasks = {}
         self._CO_LOCKED_TASKS = co_locked_tasks
     end
+    local co_waiting_tasks = self._CO_WAITING_TASKS
+    if co_waiting_tasks == nil then
+        co_waiting_tasks = {}
+        self._CO_WAITING_TASKS = co_waiting_tasks
+    end
     while true do
+
+        -- try to lock it
         if co_locked_tasks[lockname] == nil then
             co_locked_tasks[lockname] = running
             return true
         end
 
         -- this lock has been occupied, we need to wait it
-        local co_waiting_tasks = self._CO_WAITING_TASKS
-        if co_waiting_tasks == nil then
-            co_waiting_tasks = {}
-            self._CO_WAITING_TASKS = co_waiting_tasks
-        end
         co_waiting_tasks[lockname] = co_waiting_tasks[lockname] or {}
         table.insert(co_waiting_tasks[lockname], running)
 
@@ -549,6 +551,11 @@ function scheduler:co_unlock(lockname)
         return false, "we must call co_unlock() in coroutine with scheduler!"
     end
 
+    -- is stopped?
+    if not self._STARTED then
+        return false, "the scheduler is stopped!"
+    end
+
     -- do unlock
     local co_locked_tasks = self._CO_LOCKED_TASKS
     if co_locked_tasks == nil then