update tbox

6 files changed, 15 insertions, 6 deletions

diff --git a/core/src/tbox/makefile b/core/src/tbox/makefile
index 009df5b31..1b2ad1299 100644
--- a/core/src/tbox/makefile
+++ b/core/src/tbox/makefile
@@ -239,7 +239,7 @@ tbox_C_FILES 			+= \
 						tbox/src/tbox/platform/time \
 						tbox/src/tbox/platform/timer \
 						tbox/src/tbox/platform/impl/charset \
-						tbox/src/tbox/platform/impl/sockdata \
+						tbox/src/tbox/platform/impl/pollerdata \
 						tbox/src/tbox/platform/impl/dns \
 						tbox/src/tbox/platform/impl/platform \
 						tbox/src/tbox/libm/isfin \
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject cc50f173f927b6e9be84383cde4934b8dff6284
+Subproject ecb595489e33f2e0ba5b7f8a0d2294038339f2b
diff --git a/core/src/xmake/io/poller_insert.c b/core/src/xmake/io/poller_insert.c
index 8a611be38..bb238ad93 100644
--- a/core/src/xmake/io/poller_insert.c
+++ b/core/src/xmake/io/poller_insert.c
@@ -53,7 +53,10 @@ tb_int_t xm_io_poller_insert(lua_State* lua)
     tb_size_t events = (tb_size_t)luaL_checknumber(lua, 2);
 
     // insert events to poller
-    lua_pushboolean(lua, tb_poller_insert(xm_io_poller(), sock, events, tb_null));
+    tb_poller_object_t object;
+    object.type = TB_POLLER_OBJECT_SOCK;
+    object.ref.sock = sock;
+    lua_pushboolean(lua, tb_poller_insert(xm_io_poller(), &object, events, tb_null));
     return 1;
 }
 
diff --git a/core/src/xmake/io/poller_modify.c b/core/src/xmake/io/poller_modify.c
index 0c4368f6e..5fea50938 100644
--- a/core/src/xmake/io/poller_modify.c
+++ b/core/src/xmake/io/poller_modify.c
@@ -53,7 +53,10 @@ tb_int_t xm_io_poller_modify(lua_State* lua)
     tb_size_t events = (tb_size_t)luaL_checknumber(lua, 2);
 
     // modify events in poller
-    lua_pushboolean(lua, tb_poller_modify(xm_io_poller(), sock, events, tb_null));
+    tb_poller_object_t object;
+    object.type = TB_POLLER_OBJECT_SOCK;
+    object.ref.sock = sock;
+    lua_pushboolean(lua, tb_poller_modify(xm_io_poller(), &object, events, tb_null));
     return 1;
 }
 
diff --git a/core/src/xmake/io/poller_remove.c b/core/src/xmake/io/poller_remove.c
index 149bb84ce..2bce6305d 100644
--- a/core/src/xmake/io/poller_remove.c
+++ b/core/src/xmake/io/poller_remove.c
@@ -50,7 +50,10 @@ tb_int_t xm_io_poller_remove(lua_State* lua)
     tb_check_return_val(sock, 0);
 
     // remove events from poller
-    lua_pushboolean(lua, tb_poller_remove(xm_io_poller(), sock));
+    tb_poller_object_t object;
+    object.type = TB_POLLER_OBJECT_SOCK;
+    object.ref.sock = sock;
+    lua_pushboolean(lua, tb_poller_remove(xm_io_poller(), &object));
     return 1;
 }
 
diff --git a/core/src/xmake/io/poller_wait.c b/core/src/xmake/io/poller_wait.c
index 9b389d67e..6b466b565 100644
--- a/core/src/xmake/io/poller_wait.c
+++ b/core/src/xmake/io/poller_wait.c
@@ -42,14 +42,14 @@ static tb_int_t   g_events_count = 0;
 /* //////////////////////////////////////////////////////////////////////////////////////
  * private implementation
  */
-static tb_void_t xm_io_poller_event(tb_poller_ref_t poller, tb_socket_ref_t sock, tb_size_t events, tb_cpointer_t priv)
+static tb_void_t xm_io_poller_event(tb_poller_ref_t poller, tb_poller_object_ref_t object, tb_long_t events, tb_cpointer_t priv)
 {
     // check
     tb_assert_and_check_return(g_lua);
 
     // save socket and events
     lua_newtable(g_lua);
-    lua_pushlightuserdata(g_lua, (tb_pointer_t)sock);
+    lua_pushlightuserdata(g_lua, (tb_pointer_t)object->ref.sock);
     lua_rawseti(g_lua, -2, 1);
     lua_pushinteger(g_lua, (tb_int_t)events);
     lua_rawseti(g_lua, -2, 2);