seperate poller

2 files changed, 101 insertions, 73 deletions

diff --git a/xmake/core/base/poller.lua b/xmake/core/base/poller.lua
new file mode 100644
index 000000000..f853c3c92
--- /dev/null
+++ b/xmake/core/base/poller.lua
@@ -0,0 +1,101 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        poller.lua
+--
+
+-- define module
+local poller = poller or {}
+
+-- load modules
+local io     = require("base/io")
+local string = require("base/string")
+
+-- get socket events from poller
+function poller:events(sock)
+    return self._CACHE and self._CACHE[sock] or nil
+end
+
+-- set socket events to poller
+function poller:events_set(sock, events)
+    local cache = self._CACHE 
+    if not cache then
+        cache = {}
+        self._CACHE = cache
+    end
+    cache[sock] = events
+end
+
+-- insert socket events to poller
+function poller:insert(sock, events)
+
+    -- ensure opened
+    local ok, errors = sock:_ensure_opened()
+    if not ok then
+        return false, errors
+    end
+
+    -- insert it
+    if not io.poller_insert(sock._SOCK, events) then
+        return false, string.format("insert %s events(%d) to poller failed!", sock, events)
+    end
+
+    -- save this socket events and save sock/ref for gc
+    self:events_set(sock, events)
+    return true
+end
+
+-- modify socket events in poller
+function poller:modify(sock, events)
+
+    -- ensure opened
+    local ok, errors = sock:_ensure_opened()
+    if not ok then
+        return false, errors
+    end
+
+    -- modify it
+    if not io.poller_modify(sock._SOCK, events) then
+        return false, string.format("modify %s events(%d) to poller failed!", sock, events)
+    end
+
+    -- update this socket events 
+    self:events_set(sock, events)
+    return true
+end
+
+-- remove socket from poller
+function poller:remove(sock)
+
+    -- ensure opened
+    local ok, errors = sock:_ensure_opened()
+    if not ok then
+        return false, errors
+    end
+
+    -- remove it
+    if not io.poller_remove(sock._SOCK) then
+        return false, string.format("remove %s from poller failed!", sock)
+    end
+
+    -- remove this socket events
+    self:events_set(sock, nil)
+    return true
+end
+
+-- return module
+return poller
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 8992995e9..4a2dfdcdc 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -20,7 +20,6 @@
 
 -- define module
 local socket      = socket or {}
-local _poller     = _poller or {}
 local _instance   = _instance or {}
 
 -- load modules
@@ -520,78 +519,6 @@ function _instance:__gc()
     end
 end
 
--- get socket events from poller
-function _poller:events(sock)
-    return self._CACHE and self._CACHE[sock] or nil
-end
-
--- set socket events to poller
-function _poller:events_set(sock, events)
-    local cache = self._CACHE 
-    if not cache then
-        cache = {}
-        self._CACHE = cache
-    end
-    cache[sock] = events
-end
-
--- insert socket events to poller
-function _poller:insert(sock, events)
-
-    -- ensure opened
-    local ok, errors = sock:_ensure_opened()
-    if not ok then
-        return false, errors
-    end
-
-    -- insert it
-    if not io.poller_insert(sock._SOCK, events) then
-        return false, string.format("insert %s events(%d) to poller failed!", sock, events)
-    end
-
-    -- save this socket events and save sock/ref for gc
-    self:events_set(sock, events)
-    return true
-end
-
--- modify socket events in poller
-function _poller:modify(sock, events)
-
-    -- ensure opened
-    local ok, errors = sock:_ensure_opened()
-    if not ok then
-        return false, errors
-    end
-
-    -- modify it
-    if not io.poller_modify(sock._SOCK, events) then
-        return false, string.format("modify %s events(%d) to poller failed!", sock, events)
-    end
-
-    -- update this socket events 
-    self:events_set(sock, events)
-    return true
-end
-
--- remove socket from poller
-function _poller:remove(sock)
-
-    -- ensure opened
-    local ok, errors = sock:_ensure_opened()
-    if not ok then
-        return false, errors
-    end
-
-    -- remove it
-    if not io.poller_remove(sock._SOCK) then
-        return false, string.format("remove %s from poller failed!", sock)
-    end
-
-    -- remove this socket events
-    self:events_set(sock, nil)
-    return true
-end
-
 -- open a socket
 --
 -- @param socktype      the socket type, e.g. tcp, udp, icmp