Added fd_add method for uloop lua binding.

Use uloop.fd_add like this:

    local socket = require "socket"

    udp = socket.udp()

    uloop.fd_add(
        udp, -- socket
        function( -- callback function
            ufd,    -- socket object when register the fd
            events  -- uloop events. eg. uloop.ULOOP_READ .
        )
            local words, msg_or_ip, port_or_nil = ufd:receivefrom()
            print('Recv UDP packet from '..msg_or_ip..':'..port_or_nil..' : '..words)
        end,
        uloop.ULOOP_READ -- event you want to listen
    )

The `examples/uloop-example.lua` show an example of this work.

Signed-off-by: Xiongfei(Alex) Guo <xfguo@credosemi.com>

diff --git a/examples/uloop-example.lua b/examples/uloop-example.lua
index 2da6ebdab203f8a765e1fc2b0edb6a414907066d..ba34ec52db3525ea13cebf9a68182a3a567ab4de 100755 (executable)
--- a/examples/uloop-example.lua
+++ b/examples/uloop-example.lua
@@ -1,8 +1,14 @@
 #!/usr/bin/env lua
 
+local socket = require "socket"
+
 local uloop = require("uloop")
 uloop.init()
 
+local udp = socket.udp()
+udp:settimeout(0)
+udp:setsockname('*', 8080)
+
 -- timer example 1
 local timer
 function t()
@@ -40,5 +46,22 @@ uloop.timer(
        end, 2000
 )
 
+uloop.fd_add(udp, function(ufd, events)
+       local words, msg_or_ip, port_or_nil = ufd:receivefrom()
+       print('Recv UDP packet from '..msg_or_ip..':'..port_or_nil..' : '..words)
+end, uloop.ULOOP_READ)
+
+udp_send_timer = uloop.timer(
+       function()
+               local s = socket.udp()
+               local words = 'Hello!'
+               print('Send UDP packet to 127.0.0.1:8080 :'..words)
+               s:sendto(words, '127.0.0.1', 8080)
+               s:close()
+
+               udp_send_timer:set(1000)
+       end, 3000
+)
+
 uloop.run()
 

diff --git a/lua/uloop.c b/lua/uloop.c
index 5922e0470697186a7920693a7e760a0b9cb21602..c71d537a5a904f83028caad2818cbeb0cbbcfe4b 100644 (file)
--- a/lua/uloop.c
+++ b/lua/uloop.c
@@ -25,6 +25,12 @@
 #include "../uloop.h"
 #include "../list.h"
 
+struct lua_uloop_fd {
+       struct uloop_fd fd;
+       int r;
+       int fd_r;
+};
+
 struct lua_uloop_timeout {
        struct uloop_timeout t;
        int r;
@@ -44,7 +50,9 @@ static void ul_timer_cb(struct uloop_timeout *t)
        lua_getglobal(state, "__uloop_cb");
        lua_rawgeti(state, -1, tout->r);
        lua_remove(state, -2);
+
        lua_call(state, 0, 0);
+
 }
 
 static int ul_timer_set(lua_State *L)
@@ -127,12 +135,95 @@ static int ul_timer(lua_State *L)
        return 1;
 }
 
+static void ul_ufd_cb(struct uloop_fd *fd, unsigned int events)
+{
+       struct lua_uloop_fd *ufd = container_of(fd, struct lua_uloop_fd, fd);
+
+       lua_getglobal(state, "__uloop_cb");
+       lua_rawgeti(state, -1, ufd->r);
+       lua_remove(state, -2);
+
+       /* push fd object */
+       lua_getglobal(state, "__uloop_fds");
+       lua_rawgeti(state, -1, ufd->fd_r);
+       lua_remove(state, -2);
+
+       /* push events */
+       lua_pushinteger(state, events);
+
+       lua_call(state, 2, 0);
+}
+
+
+static int get_sock_fd(lua_State* L, int idx) {
+       int fd;
+       if(lua_isnumber(L, idx)) {
+               fd = lua_tonumber(L, idx);
+       } else {
+               luaL_checktype(L, idx, LUA_TUSERDATA);
+               lua_getfield(L, idx, "getfd");
+               if(lua_isnil(L, -1))
+                       return luaL_error(L, "socket type missing 'getfd' method");
+               lua_pushvalue(L, idx - 1);
+               lua_call(L, 1, 1);
+               fd = lua_tointeger(L, -1);
+               lua_pop(L, 1);
+       }
+       return fd;
+}
+
+static int ul_ufd_add(lua_State *L)
+{
+       struct lua_uloop_fd *ufd;
+       int fd = 0;
+       unsigned int flags = 0;
+       int ref;
+       int fd_ref;
+
+       if (lua_isnumber(L, -1)) {
+               flags = lua_tointeger(L, -1);
+               lua_pop(L, 1);
+       }
+
+       if (!lua_isfunction(L, -1)) {
+               lua_pushstring(L, "invalid arg list");
+               lua_error(L);
+
+               return 0;
+       }
+
+       fd = get_sock_fd(L, -2);
+
+       lua_getglobal(L, "__uloop_cb");
+       lua_pushvalue(L, -2);
+       ref = luaL_ref(L, -2);
+       lua_pop(L, 1);
+
+       lua_getglobal(L, "__uloop_fds");
+       lua_pushvalue(L, -3);
+       fd_ref = luaL_ref(L, -2);
+       lua_pop(L, 1);
+
+       ufd = lua_newuserdata(L, sizeof(*ufd));
+       memset(ufd, 0, sizeof(*ufd));
+
+       ufd->r = ref;
+       ufd->fd.fd = fd;
+       ufd->fd_r = fd_ref;
+       ufd->fd.cb = ul_ufd_cb;
+       if (flags)
+               uloop_fd_add(&ufd->fd, flags);
+
+       return 1;
+}
+
 static void ul_process_cb(struct uloop_process *p, int ret)
 {
        struct lua_uloop_process *proc = container_of(p, struct lua_uloop_process, p);
 
        lua_getglobal(state, "__uloop_cb");
        lua_rawgeti(state, -1, proc->r);
+
        luaL_unref(state, -2, proc->r);
        lua_remove(state, -2);
        lua_pushinteger(state, ret >> 8);
@@ -225,6 +316,7 @@ static luaL_reg uloop_func[] = {
        {"run", ul_run},
        {"timer", ul_timer},
        {"process", ul_process},
+       {"fd_add", ul_ufd_add},
        {NULL, NULL},
 };
 
@@ -239,11 +331,30 @@ int luaopen_uloop(lua_State *L)
        lua_createtable(L, 1, 0);
        lua_setglobal(L, "__uloop_cb");
 
+       lua_createtable(L, 1, 0);
+       lua_setglobal(L, "__uloop_fds");
+
        luaL_openlib(L, "uloop", uloop_func, 0);
        lua_pushstring(L, "_VERSION");
        lua_pushstring(L, "1.0");
        lua_rawset(L, -3);
 
+       lua_pushstring(L, "ULOOP_READ");
+       lua_pushinteger(L, ULOOP_READ);
+       lua_rawset(L, -3);
+
+       lua_pushstring(L, "ULOOP_WRITE");
+       lua_pushinteger(L, ULOOP_WRITE);
+       lua_rawset(L, -3);
+
+       lua_pushstring(L, "ULOOP_EDGE_TRIGGER");
+       lua_pushinteger(L, ULOOP_EDGE_TRIGGER);
+       lua_rawset(L, -3);
+
+       lua_pushstring(L, "ULOOP_BLOCKING");
+       lua_pushinteger(L, ULOOP_BLOCKING);
+       lua_rawset(L, -3);
+
        return 1;
 }