cancel socket from scheduler

1 files changed, 9 insertions, 1 deletions

diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 7497d7b8a..ffae67082 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -482,7 +482,7 @@ function _instance:wait(events, timeout)
     local result = -1
     local errors = nil
     if scheduler:co_running() then
-        result, errors = scheduler:waitsock(self, events, timeout or -1)
+        result, errors = scheduler:sock_wait(self, events, timeout or -1)
     else
         result, errors = io.socket_wait(self:csock(), events, timeout or -1)
     end
@@ -501,6 +501,14 @@ function _instance:close()
         return false, errors
     end
 
+    -- cancel socket events from the scheduler
+    if scheduler:co_running() then
+        ok, errors = scheduler:sock_cancel(self)
+        if not ok then
+            return false, errors
+        end
+    end
+
     -- close it
     ok = io.socket_close(self:csock())
     if ok then