Import ubus tools.

3P/libubox/lua/CMakeLists.txt

@@ -0,0 +1,52 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(uloop C)
+
+SET(CMAKE_INSTALL_PREFIX /)
+
+IF(NOT LUA_CFLAGS)
+	FIND_PROGRAM(PKG_CONFIG pkg-config)
+	IF(PKG_CONFIG)
+		EXECUTE_PROCESS(
+			COMMAND pkg-config --silence-errors --cflags lua5.1
+			OUTPUT_VARIABLE LUA_CFLAGS
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+		)
+	ENDIF()
+ENDIF()
+
+ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I.. ${LUA_CFLAGS})
+LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+IF(APPLE)
+	ADD_DEFINITIONS(-I/opt/local/include)
+	SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -undefined dynamic_lookup")
+ENDIF(APPLE)
+
+IF(NOT LUAPATH)
+	EXECUTE_PROCESS(
+		COMMAND  lua -e "for k in string.gmatch(package.cpath .. \";\", \"([^;]+)/..so;\") do if k:sub(1,1) == \"/\" then print(k) break end end"
+		OUTPUT_VARIABLE LUAPATH
+		RESULT_VARIABLE LUA_CHECK_RES
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+
+	IF(BUILD_LUA)
+		IF(NOT ${LUA_CHECK_RES} EQUAL 0 OR "${LUAPATH}" EQUAL "")
+			MESSAGE(SEND_ERROR "Lua was not found on your system")
+		ENDIF()
+	ENDIF()
+ENDIF()
+
+IF(BUILD_LUA)
+	ADD_LIBRARY(uloop_lua MODULE uloop.c)
+	SET_TARGET_PROPERTIES(uloop_lua PROPERTIES
+		OUTPUT_NAME uloop
+		PREFIX ""
+	)
+	TARGET_LINK_LIBRARIES(uloop_lua ubox)
+
+	INSTALL(TARGETS uloop_lua
+		LIBRARY DESTINATION ${LUAPATH}
+	)
+ENDIF()

3P/libubox/lua/builders/linux-gcc/_rt3052d_Cabasse_Stream1_64-debug-shared/uloop.dep

@@ -0,0 +1,8 @@
+uloop.o: ../../../uloop.c \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/luaconf.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lnum_config.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lualib.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lauxlib.h \
+  ../../../../uloop.h ../../../../list.h ../../../../list.h

3P/libubox/lua/builders/linux-gcc/_rt3052d_Cabasse_Stream1_64-release-shared/uloop.dep

@@ -0,0 +1,8 @@
+uloop.o: ../../../uloop.c \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/luaconf.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lnum_config.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lualib.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lauxlib.h \
+  ../../../../uloop.h ../../../../list.h ../../../../list.h

3P/libubox/lua/builders/linux-gcc/_rt3052d_StriimSOUND-debug-shared/uloop.dep

@@ -0,0 +1,8 @@
+uloop.o: ../../../uloop.c \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/luaconf.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lnum_config.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lualib.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lauxlib.h \
+  ../../../../uloop.h ../../../../list.h ../../../../list.h

3P/libubox/lua/builders/linux-gcc/_rt3052d_StriimSOUND-release-shared/uloop.dep

@@ -0,0 +1,8 @@
+uloop.o: ../../../uloop.c \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/luaconf.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lnum_config.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lualib.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lua.h \
+  /home/jbnadal/sources/Audio_trunk/AwoxAudio/Libs/External/lua/src/lauxlib.h \
+  ../../../../uloop.h ../../../../list.h ../../../../list.h

3P/libubox/lua/uloop.c

@@ -0,0 +1,419 @@
+/*
+ * Copyright (C) 2012 John Crispin <blogic@openwrt.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <lua.h>
+#include <lualib.h>
+#include <lauxlib.h>
+
+#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;
+};
+
+struct lua_uloop_process {
+	struct uloop_process p;
+	int r;
+};
+
+static lua_State *state;
+
+static void ul_timer_cb(struct uloop_timeout *t)
+{
+	struct lua_uloop_timeout *tout = container_of(t, struct lua_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)
+{
+	struct lua_uloop_timeout *tout;
+	double set;
+
+	if (!lua_isnumber(L, -1)) {
+		lua_pushstring(L, "invalid arg list");
+		lua_error(L);
+
+		return 0;
+	}
+
+	set = lua_tointeger(L, -1);
+	tout = lua_touserdata(L, 1);
+	uloop_timeout_set(&tout->t, set);
+
+	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(state, -1, tout->r);
+
+	return 1;
+}
+
+static const luaL_Reg timer_m[] = {
+	{ "set", ul_timer_set },
+	{ "cancel", ul_timer_free },
+	{ NULL, NULL }
+};
+
+static int ul_timer(lua_State *L)
+{
+	struct lua_uloop_timeout *tout;
+	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);
+
+	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->r = ref;
+	tout->t.cb = ul_timer_cb;
+	if (set)
+		uloop_timeout_set(&tout->t, set);
+
+	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_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 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));
+
+	lua_createtable(L, 0, 2);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+	lua_pushcfunction(L, ul_ufd_delete);
+	lua_setfield(L, -2, "__gc");
+	lua_pushvalue(L, -1);
+	lua_setmetatable(L, -3);
+	lua_pushvalue(L, -2);
+	luaI_openlib(L, NULL, ufd_m, 1);
+	lua_pushvalue(L, -2);
+
+	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);
+	lua_call(state, 1, 0);
+}
+
+static int ul_process(lua_State *L)
+{
+	struct lua_uloop_process *proc;
+	pid_t pid;
+	int ref;
+
+	if (!lua_isfunction(L, -1) || !lua_istable(L, -2) ||
+			!lua_istable(L, -3) || !lua_isstring(L, -4)) {
+		lua_pushstring(L, "invalid arg list");
+		lua_error(L);
+
+		return 0;
+	}
+
+	pid = fork();
+
+	if (pid == -1) {
+		lua_pushstring(L, "failed to fork");
+		lua_error(L);
+
+		return 0;
+	}
+
+	if (pid == 0) {
+		/* child */
+		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);
+		int i = 1;
+
+		argp[0] = (char*) lua_tostring(L, -4);
+		for (i = 1; i <= argn; i++) {
+			lua_rawgeti(L, -3, i);
+			argp[i] = (char*) lua_tostring(L, -1);
+			lua_pop(L, 1);
+		}
+		argp[i] = NULL;
+
+		for (i = 1; i <= envn; i++) {
+			lua_rawgeti(L, -2, i);
+			envp[i - 1] = (char*) lua_tostring(L, -1);
+			lua_pop(L, 1);
+		}
+		envp[i - 1] = NULL;
+
+		execve(*argp, argp, envp);
+		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->r = ref;
+	proc->p.pid = pid;
+	proc->p.cb = ul_process_cb;
+	uloop_process_add(&proc->p);
+
+	return 1;
+}
+
+static int ul_init(lua_State *L)
+{
+	uloop_init();
+	lua_pushboolean(L, 1);
+
+	return 1;
+}
+
+static int ul_run(lua_State *L)
+{
+	uloop_run();
+	lua_pushboolean(L, 1);
+
+	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},
+	{"cancel", ul_end},
+	{NULL, NULL},
+};
+
+/* avoid warnings about missing declarations */
+int luaopen_uloop(lua_State *L);
+int luaclose_uloop(lua_State *L);
+
+int luaopen_uloop(lua_State *L)
+{
+	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;
+}
+
+int luaclose_uloop(lua_State *L)
+{
+	lua_pushstring(L, "Called");
+
+	return 1;
+}