int r;
};
+struct lua_uloop_interval {
+ struct uloop_interval i;
+ int r;
+};
+
+struct lua_uloop_signal {
+ struct uloop_signal s;
+ int r;
+};
+
static lua_State *state;
+static void *
+ul_create_userdata(lua_State *L, size_t size, const luaL_Reg *reg, lua_CFunction gc)
+{
+ void *ret = lua_newuserdata(L, size);
+
+ memset(ret, 0, size);
+ lua_createtable(L, 0, 2);
+ lua_pushvalue(L, -1);
+ lua_setfield(L, -2, "__index");
+ lua_pushcfunction(L, gc);
+ lua_setfield(L, -2, "__gc");
+ lua_pushvalue(L, -1);
+ lua_setmetatable(L, -3);
+ lua_pushvalue(L, -2);
+ luaI_openlib(L, NULL, reg, 1);
+ lua_pushvalue(L, -2);
+
+ return ret;
+}
+
static void ul_timer_cb(struct uloop_timeout *t)
{
struct lua_uloop_timeout *tout = container_of(t, struct lua_uloop_timeout, t);
return 1;
}
+static int ul_timer_remaining(lua_State *L)
+{
+ struct lua_uloop_timeout *tout;
+
+ tout = lua_touserdata(L, 1);
+ lua_pushnumber(L, uloop_timeout_remaining64(&tout->t));
+ return 1;
+}
+
static int ul_timer_free(lua_State *L)
{
struct lua_uloop_timeout *tout = lua_touserdata(L, 1);
uloop_timeout_cancel(&tout->t);
+
+ /* obj.__index.__gc = nil , make sure executing only once*/
+ lua_getfield(L, -1, "__index");
+ lua_pushstring(L, "__gc");
+ lua_pushnil(L);
+ lua_settable(L, -3);
+
lua_getglobal(state, "__uloop_cb");
- luaL_unref(L, -1, tout->r);
+ luaL_unref(state, -1, tout->r);
return 1;
}
static const luaL_Reg timer_m[] = {
{ "set", ul_timer_set },
+ { "remaining", ul_timer_remaining },
{ "cancel", ul_timer_free },
{ NULL, NULL }
};
lua_pushvalue(L, -2);
ref = luaL_ref(L, -2);
- tout = lua_newuserdata(L, sizeof(*tout));
- lua_createtable(L, 0, 2);
- lua_pushvalue(L, -1);
- lua_setfield(L, -2, "__index");
- lua_pushcfunction(L, ul_timer_free);
- lua_setfield(L, -2, "__gc");
- lua_pushvalue(L, -1);
- lua_setmetatable(L, -3);
- lua_pushvalue(L, -2);
- luaI_openlib(L, NULL, timer_m, 1);
- lua_pushvalue(L, -2);
-
- memset(tout, 0, sizeof(*tout));
-
+ tout = ul_create_userdata(L, sizeof(*tout), timer_m, ul_timer_free);
tout->r = ref;
tout->t.cb = ul_timer_cb;
+
if (set)
uloop_timeout_set(&tout->t, set);
/* push events */
lua_pushinteger(state, events);
-
lua_call(state, 2, 0);
}
lua_getfield(L, idx, "getfd");
if(lua_isnil(L, -1))
return luaL_error(L, "socket type missing 'getfd' method");
- lua_pushvalue(L, idx - 1);
+ /* if we have absolute, no need to adjust for getfield() call */
+ lua_pushvalue(L, idx > 0 ? idx: idx - 1);
lua_call(L, 1, 1);
fd = lua_tointeger(L, -1);
lua_pop(L, 1);
return fd;
}
+static int ul_ufd_delete(lua_State *L)
+{
+ struct lua_uloop_fd *ufd = lua_touserdata(L, 1);
+
+ uloop_fd_delete(&ufd->fd);
+
+ /* obj.__index.__gc = nil , make sure executing only once*/
+ lua_getfield(L, -1, "__index");
+ lua_pushstring(L, "__gc");
+ lua_pushnil(L);
+ lua_settable(L, -3);
+
+ lua_getglobal(state, "__uloop_cb");
+ luaL_unref(state, -1, ufd->r);
+ lua_remove(state, -1);
+
+ lua_getglobal(state, "__uloop_fds");
+ luaL_unref(state, -1, ufd->fd_r);
+ lua_remove(state, -1);
+
+ return 1;
+}
+
+static const luaL_Reg ufd_m[] = {
+ { "delete", ul_ufd_delete },
+ { NULL, NULL }
+};
+
static int ul_ufd_add(lua_State *L)
{
struct lua_uloop_fd *ufd;
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");
+ flags = luaL_checkinteger(L, 3);
+ if (!flags) {
+ lua_pushstring(L, "flags cannot be zero");
lua_error(L);
-
- return 0;
}
- fd = get_sock_fd(L, -2);
+ luaL_checktype(L, 2, LUA_TFUNCTION);
+
+ fd = get_sock_fd(L, 1);
lua_getglobal(L, "__uloop_cb");
- lua_pushvalue(L, -2);
+ lua_pushvalue(L, 2);
ref = luaL_ref(L, -2);
lua_pop(L, 1);
lua_getglobal(L, "__uloop_fds");
- lua_pushvalue(L, -3);
+ lua_pushvalue(L, 1);
fd_ref = luaL_ref(L, -2);
lua_pop(L, 1);
- ufd = lua_newuserdata(L, sizeof(*ufd));
- memset(ufd, 0, sizeof(*ufd));
-
+ ufd = ul_create_userdata(L, sizeof(*ufd), ufd_m, ul_ufd_delete);
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);
+ uloop_fd_add(&ufd->fd, flags);
return 1;
}
+static int ul_process_free(lua_State *L)
+{
+ struct lua_uloop_process *proc = lua_touserdata(L, 1);
+
+ /* obj.__index.__gc = nil , make sure executing only once*/
+ lua_getfield(L, -1, "__index");
+ lua_pushstring(L, "__gc");
+ lua_pushnil(L);
+ lua_settable(L, -3);
+
+ if (proc->r != LUA_NOREF) {
+ uloop_process_delete(&proc->p);
+
+ lua_getglobal(state, "__uloop_cb");
+ luaL_unref(state, -1, proc->r);
+ lua_remove(state, -1);
+ }
+
+ return 1;
+}
+
+static int ul_process_pid(lua_State *L)
+{
+ struct lua_uloop_process *proc = lua_touserdata(L, 1);
+
+ if (proc->p.pid) {
+ lua_pushnumber(L, proc->p.pid);
+ return 1;
+ }
+
+ return 0;
+}
+
+static const luaL_Reg process_m[] = {
+ { "delete", ul_process_free },
+ { "pid", ul_process_pid },
+ { NULL, NULL }
+};
+
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_rawgeti(state, -1, proc->r);
luaL_unref(state, -2, proc->r);
+ proc->r = LUA_NOREF;
lua_remove(state, -2);
lua_pushinteger(state, ret >> 8);
lua_call(state, 1, 0);
int argn = lua_objlen(L, -3);
int envn = lua_objlen(L, -2);
char** argp = malloc(sizeof(char*) * (argn + 2));
- char** envp = malloc(sizeof(char*) * envn + 1);
+ char** envp = malloc(sizeof(char*) * (envn + 1));
int i = 1;
+ if (!argp || !envp)
+ _exit(-1);
+
argp[0] = (char*) lua_tostring(L, -4);
for (i = 1; i <= argn; i++) {
lua_rawgeti(L, -3, i);
envp[i - 1] = NULL;
execve(*argp, argp, envp);
- exit(-1);
+ _exit(-1);
}
lua_getglobal(L, "__uloop_cb");
lua_pushvalue(L, -2);
ref = luaL_ref(L, -2);
- proc = lua_newuserdata(L, sizeof(*proc));
- memset(proc, 0, sizeof(*proc));
-
+ proc = ul_create_userdata(L, sizeof(*proc), process_m, ul_process_free);
proc->r = ref;
proc->p.pid = pid;
proc->p.cb = ul_process_cb;
return 1;
}
+static void ul_interval_cb(struct uloop_interval *i)
+{
+ struct lua_uloop_interval *intv = container_of(i, struct lua_uloop_interval, i);
+
+ lua_getglobal(state, "__uloop_cb");
+ lua_rawgeti(state, -1, intv->r);
+ lua_remove(state, -2);
+
+ lua_call(state, 0, 0);
+}
+
+static int ul_interval_set(lua_State *L)
+{
+ struct lua_uloop_interval *intv;
+ double set;
+
+ if (!lua_isnumber(L, -1)) {
+ lua_pushstring(L, "invalid arg list");
+ lua_error(L);
+
+ return 0;
+ }
+
+ set = lua_tointeger(L, -1);
+ intv = lua_touserdata(L, 1);
+ uloop_interval_set(&intv->i, set);
+
+ return 1;
+}
+
+static int ul_interval_expirations(lua_State *L)
+{
+ struct lua_uloop_interval *intv;
+
+ intv = lua_touserdata(L, 1);
+ lua_pushinteger(L, intv->i.expirations);
+ return 1;
+}
+
+static int ul_interval_remaining(lua_State *L)
+{
+ struct lua_uloop_interval *intv;
+
+ intv = lua_touserdata(L, 1);
+ lua_pushnumber(L, uloop_interval_remaining(&intv->i));
+ return 1;
+}
+
+static int ul_interval_free(lua_State *L)
+{
+ struct lua_uloop_interval *intv = lua_touserdata(L, 1);
+
+ uloop_interval_cancel(&intv->i);
+
+ /* obj.__index.__gc = nil , make sure executing only once*/
+ lua_getfield(L, -1, "__index");
+ lua_pushstring(L, "__gc");
+ lua_pushnil(L);
+ lua_settable(L, -3);
+
+ lua_getglobal(state, "__uloop_cb");
+ luaL_unref(state, -1, intv->r);
+
+ return 1;
+}
+
+static const luaL_Reg interval_m[] = {
+ { "set", ul_interval_set },
+ { "expirations", ul_interval_expirations },
+ { "remaining", ul_interval_remaining },
+ { "cancel", ul_interval_free },
+ { NULL, NULL }
+};
+
+static int ul_interval(lua_State *L)
+{
+ struct lua_uloop_interval *intv;
+ unsigned int set = 0;
+ int ref;
+
+ if (lua_isnumber(L, -1)) {
+ set = lua_tointeger(L, -1);
+ lua_pop(L, 1);
+ }
+
+ if (!lua_isfunction(L, -1)) {
+ lua_pushstring(L, "invalid arg list");
+ lua_error(L);
+
+ return 0;
+ }
+
+ lua_getglobal(L, "__uloop_cb");
+ lua_pushvalue(L, -2);
+ ref = luaL_ref(L, -2);
+
+ intv = ul_create_userdata(L, sizeof(*intv), interval_m, ul_interval_free);
+ intv->r = ref;
+ intv->i.cb = ul_interval_cb;
+
+ if (set)
+ uloop_interval_set(&intv->i, set);
+
+ return 1;
+}
+
+static void ul_signal_cb(struct uloop_signal *s)
+{
+ struct lua_uloop_signal *sig = container_of(s, struct lua_uloop_signal, s);
+
+ lua_getglobal(state, "__uloop_cb");
+ lua_rawgeti(state, -1, sig->r);
+ lua_remove(state, -2);
+ lua_pushinteger(state, sig->s.signo);
+
+ lua_call(state, 1, 0);
+}
+
+static int ul_signal_signo(lua_State *L)
+{
+ struct lua_uloop_signal *sig = lua_touserdata(L, 1);
+
+ lua_pushinteger(L, sig->s.signo);
+
+ return 1;
+}
+
+static int ul_signal_free(lua_State *L)
+{
+ struct lua_uloop_signal *sig = lua_touserdata(L, 1);
+
+ uloop_signal_delete(&sig->s);
+
+ /* obj.__index.__gc = nil , make sure executing only once*/
+ lua_getfield(L, -1, "__index");
+ lua_pushstring(L, "__gc");
+ lua_pushnil(L);
+ lua_settable(L, -3);
+
+ lua_getglobal(state, "__uloop_cb");
+ luaL_unref(state, -1, sig->r);
+
+ return 1;
+}
+
+static const luaL_Reg signal_m[] = {
+ { "signo", ul_signal_signo },
+ { "delete", ul_signal_free },
+ { NULL, NULL }
+};
+
+static int ul_signal(lua_State *L)
+{
+ struct lua_uloop_signal *sig;
+ int signo = -1;
+ int ref;
+
+ if (lua_isnumber(L, -1)) {
+ signo = lua_tointeger(L, -1);
+ lua_pop(L, 1);
+ }
+
+ if (!lua_isfunction(L, -1) || signo <= 0 || signo > NSIG) {
+ lua_pushstring(L, "invalid arg list");
+ lua_error(L);
+
+ return 0;
+ }
+
+ lua_getglobal(L, "__uloop_cb");
+ lua_pushvalue(L, -2);
+ ref = luaL_ref(L, -2);
+
+ sig = ul_create_userdata(L, sizeof(*sig), signal_m, ul_signal_free);
+ sig->r = ref;
+ sig->s.cb = ul_signal_cb;
+ sig->s.signo = signo;
+
+ uloop_signal_add(&sig->s);
+
+ return 1;
+}
+
static int ul_init(lua_State *L)
{
uloop_init();
return 1;
}
+static int ul_end(lua_State *L)
+{
+ uloop_end();
+ return 1;
+}
+
static luaL_reg uloop_func[] = {
{"init", ul_init},
{"run", ul_run},
{"timer", ul_timer},
{"process", ul_process},
{"fd_add", ul_ufd_add},
+ {"interval", ul_interval},
+ {"signal", ul_signal},
+ {"cancel", ul_end},
{NULL, NULL},
};
lua_pushinteger(L, ULOOP_BLOCKING);
lua_rawset(L, -3);
+#define SIGNAME_CONST(signame) do { \
+ lua_pushstring(L, #signame); \
+ lua_pushinteger(L, signame); \
+ lua_rawset(L, -3); \
+} while(0)
+
+#if defined(SIGINT)
+ SIGNAME_CONST(SIGINT);
+#endif
+#if defined(SIGILL)
+ SIGNAME_CONST(SIGILL);
+#endif
+#if defined(SIGABRT)
+ SIGNAME_CONST(SIGABRT);
+#endif
+#if defined(SIGFPE)
+ SIGNAME_CONST(SIGFPE);
+#endif
+#if defined(SIGSEGV)
+ SIGNAME_CONST(SIGSEGV);
+#endif
+#if defined(SIGTERM)
+ SIGNAME_CONST(SIGTERM);
+#endif
+#if defined(SIGHUP)
+ SIGNAME_CONST(SIGHUP);
+#endif
+#if defined(SIGQUIT)
+ SIGNAME_CONST(SIGQUIT);
+#endif
+#if defined(SIGTRAP)
+ SIGNAME_CONST(SIGTRAP);
+#endif
+#if defined(SIGKILL)
+ SIGNAME_CONST(SIGKILL);
+#endif
+#if defined(SIGPIPE)
+ SIGNAME_CONST(SIGPIPE);
+#endif
+#if defined(SIGALRM)
+ SIGNAME_CONST(SIGALRM);
+#endif
+#if defined(SIGSTKFLT)
+ SIGNAME_CONST(SIGSTKFLT);
+#endif
+#if defined(SIGPWR)
+ SIGNAME_CONST(SIGPWR);
+#endif
+#if defined(SIGBUS)
+ SIGNAME_CONST(SIGBUS);
+#endif
+#if defined(SIGSYS)
+ SIGNAME_CONST(SIGSYS);
+#endif
+#if defined(SIGURG)
+ SIGNAME_CONST(SIGURG);
+#endif
+#if defined(SIGSTOP)
+ SIGNAME_CONST(SIGSTOP);
+#endif
+#if defined(SIGTSTP)
+ SIGNAME_CONST(SIGTSTP);
+#endif
+#if defined(SIGCONT)
+ SIGNAME_CONST(SIGCONT);
+#endif
+#if defined(SIGCHLD)
+ SIGNAME_CONST(SIGCHLD);
+#endif
+#if defined(SIGTTIN)
+ SIGNAME_CONST(SIGTTIN);
+#endif
+#if defined(SIGTTOU)
+ SIGNAME_CONST(SIGTTOU);
+#endif
+#if defined(SIGPOLL)
+ SIGNAME_CONST(SIGPOLL);
+#endif
+#if defined(SIGXFSZ)
+ SIGNAME_CONST(SIGXFSZ);
+#endif
+#if defined(SIGXCPU)
+ SIGNAME_CONST(SIGXCPU);
+#endif
+#if defined(SIGVTALRM)
+ SIGNAME_CONST(SIGVTALRM);
+#endif
+#if defined(SIGPROF)
+ SIGNAME_CONST(SIGPROF);
+#endif
+#if defined(SIGUSR1)
+ SIGNAME_CONST(SIGUSR1);
+#endif
+#if defined(SIGUSR2)
+ SIGNAME_CONST(SIGUSR2);
+#endif
+
return 1;
}