add socket.wait

5 files changed, 114 insertions, 12 deletions

diff --git a/core/src/xmake/io/socket_wait.c b/core/src/xmake/io/socket_wait.c
new file mode 100644
index 000000000..982afb60b
--- /dev/null
+++ b/core/src/xmake/io/socket_wait.c
@@ -0,0 +1,61 @@
+/*!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        socket_wait.c
+ *
+ */
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * trace
+ */
+#define TB_TRACE_MODULE_NAME    "socket_wait"
+#define TB_TRACE_MODULE_DEBUG   (0)
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * includes
+ */
+#include "prefix.h"
+
+/* //////////////////////////////////////////////////////////////////////////////////////
+ * interfaces
+ */
+
+// io.socket_wait(sock, addr, port, family)
+tb_int_t xm_io_socket_wait(lua_State* lua)
+{
+    // check
+    tb_assert_and_check_return_val(lua, 0);
+
+    // is user data?
+    if (!lua_isuserdata(lua, 1)) 
+        return 0;
+
+    // get socket
+    tb_socket_ref_t sock = (tb_socket_ref_t)lua_touserdata(lua, 1);
+    tb_check_return_val(sock, 0);
+
+    // get events
+    tb_size_t events = (tb_size_t)luaL_checknumber(lua, 2);
+
+    // get timeout
+    tb_long_t timeout = (tb_long_t)luaL_checknumber(lua, 3);
+
+    // wait socket
+    lua_pushnumber(lua, (tb_int_t)tb_socket_wait(sock, events, timeout));
+    return 1;
+}
+
diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c
index 5887b0477..462ff62ef 100644
--- a/core/src/xmake/machine.c
+++ b/core/src/xmake/machine.c
@@ -112,6 +112,7 @@ tb_int_t xm_io_filelock_close(lua_State* lua);
 // the io/socket functions
 tb_int_t xm_io_socket_open(lua_State* lua);
 tb_int_t xm_io_socket_rawfd(lua_State* lua);
+tb_int_t xm_io_socket_wait(lua_State* lua);
 tb_int_t xm_io_socket_connect(lua_State* lua);
 tb_int_t xm_io_socket_close(lua_State* lua);
 
@@ -249,6 +250,7 @@ static luaL_Reg const g_io_functions[] =
 ,   { "filelock_close",     xm_io_filelock_close   }
 ,   { "socket_open",        xm_io_socket_open      }
 ,   { "socket_rawfd",       xm_io_socket_rawfd     }
+,   { "socket_wait",        xm_io_socket_wait      }
 ,   { "socket_connect",     xm_io_socket_connect   }
 ,   { "socket_close",       xm_io_socket_close     }
 ,   { tb_null,              tb_null                }
diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile
index 3176a30d7..383f71555 100644
--- a/core/src/xmake/makefile
+++ b/core/src/xmake/makefile
@@ -62,6 +62,7 @@ xmake_C_FILES 			+= \
 						io/filelock_close \
 						io/socket_open \
 						io/socket_rawfd \
+						io/socket_wait \
 						io/socket_connect \
 						io/socket_close \
 						path/relative \
diff --git a/xmake/core/base/socket.lua b/xmake/core/base/socket.lua
index 0ff3ab8b0..080cf16d9 100644
--- a/xmake/core/base/socket.lua
+++ b/xmake/core/base/socket.lua
@@ -36,12 +36,18 @@ socket.ICMP  = 3
 socket.IPV4  = 1
 socket.IPV6  = 2
 
+-- the socket events
+socket.EV_RECV = 1
+socket.EV_SEND = 2
+socket.EV_CONN = socket.EV_SEND
+socket.EV_ACPT = socket.EV_RECV
+
 -- new a socket
 function _instance.new(socktype, family, sock)
     local instance   = table.inherit(_instance)
     instance._SOCK   = sock
-    instance._TYPE   = socktype or socket.TCP
-    instance._FAMILY = family or socket.IPV4
+    instance._TYPE   = socktype 
+    instance._FAMILY = family
     setmetatable(instance, _instance)
     return instance
 end
@@ -90,6 +96,23 @@ function _instance:connect(addr, port)
     return result, errors
 end
 
+-- wait socket events
+function _instance:wait(events, timeout)
+
+    -- ensure opened
+    local ok, errors = self:_ensure_opened()
+    if not ok then
+        return -1, errors
+    end
+
+    -- wait it
+    local result, errors = io.socket_wait(self._SOCK, events, timeout or -1)
+    if result < 0 and errors then
+        errors = string.format("%s: %s", self, errors)
+    end
+    return result, errors
+end
+
 -- close socket
 function _instance:close()
 
@@ -137,6 +160,8 @@ end
 -- @return the socket instance
 --
 function socket.open(socktype, family)
+    socktype = socktype or socket.TCP
+    family   = family or socket.IPV4
     local sock, errors = io.socket_open(socktype, family)
     if sock then
         return _instance.new(socktype, family, sock)
diff --git a/xmake/core/sandbox/modules/import/core/base/socket.lua b/xmake/core/sandbox/modules/import/core/base/socket.lua
index fa9114699..f000495b3 100644
--- a/xmake/core/sandbox/modules/import/core/base/socket.lua
+++ b/xmake/core/sandbox/modules/import/core/base/socket.lua
@@ -28,6 +28,15 @@ local raise     = require("sandbox/modules/raise")
 local sandbox_core_base_socket            = sandbox_core_base_socket or {}
 local sandbox_core_base_socket_instance   = sandbox_core_base_socket_instance or {}
 
+-- wait socket events
+function sandbox_core_base_socket_instance.wait(sock, events, timeout)
+    local result, errors = sock:_wait(events, timeout)
+    if result < 0 and errors then
+        raise(errors)
+    end
+    return result
+end
+
 -- connect socket 
 function sandbox_core_base_socket_instance.connect(sock, addr, port)
     local result, errors = sock:_connect(addr, port)
@@ -90,11 +99,13 @@ end
 -- open and connect tcp/ipv4 socket
 function sandbox_core_base_socket.connect4(addr, port, timeout)
     local sock = sandbox_core_base_socket.open(socket.TCP, socket.IPV4)
-    local ok = 0
-    repeat
-        ok = sock:connect(addr, port)
-        -- TODO wait
-    until ok ~= 0
+    local ok = sock:connect(addr, port)
+    if ok == 0 then
+        ok = sock:wait(socket.EV_CONN, timeout)
+        if ok == socket.EV_CONN then
+            ok = sock:connect(addr, port)
+        end
+    end
     if ok > 0 then
         return sock
     else
@@ -106,11 +117,13 @@ end
 -- open and connect tcp/ipv6 socket
 function sandbox_core_base_socket.connect6(addr, port, timeout)
     local sock = sandbox_core_base_socket.open(socket.TCP, socket.IPV6)
-    local ok = 0
-    repeat
-        ok = sock:connect(addr, port)
-        -- TODO wait
-    until ok ~= 0
+    local ok = sock:connect(addr, port)
+    if ok == 0 then
+        ok = sock:wait(socket.EV_CONN, timeout)
+        if ok == socket.EV_CONN then
+            ok = sock:connect(addr, port)
+        end
+    end
     if ok > 0 then
         return sock
     else