Rework LuCI build system

 * Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

1 files changed, 210 insertions, 0 deletions

diff --git a/libs/luci-lib-nixio/src/poll.c b/libs/luci-lib-nixio/src/poll.c
new file mode 100644
index 0000000000..1211bc72ac
--- /dev/null
+++ b/libs/luci-lib-nixio/src/poll.c
@@ -0,0 +1,210 @@
+/*
+ * nixio - Linux I/O library for lua
+ *
+ *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
+ *
+ *  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.
+ */
+
+#include "nixio.h"
+#include <time.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/time.h>
+
+
+static int nixio_gettimeofday(lua_State *L) {
+	struct timeval tv;
+	gettimeofday(&tv, NULL);
+	nixio__pushnumber(L, tv.tv_sec);
+	nixio__pushnumber(L, tv.tv_usec);
+	return 2;
+}
+
+
+/**
+ * nanosleep()
+ */
+static int nixio_nanosleep(lua_State *L) {
+	struct timespec req, rem;
+	req.tv_sec = luaL_optint(L, 1, 0);
+	req.tv_nsec = luaL_optint(L, 2, 0);
+
+	int status = nanosleep(&req, &rem);
+	if (!status) {
+		lua_pushboolean(L, 1);
+		return 1;
+	} else {
+		if (errno == EINTR) {
+			lua_pushboolean(L, 0);
+			lua_pushinteger(L, rem.tv_sec);
+			lua_pushinteger(L, rem.tv_nsec);
+			return 3;
+		} else {
+			return nixio__perror(L);
+		}
+	}
+}
+
+/**
+ * Checks whether a flag is set in the bitmap and sets the matching table value
+ */
+static void nixio_poll_flags__r(lua_State *L, int *map, int f, const char *t) {
+	lua_pushstring(L, t);
+	if (*map & f) {
+		lua_pushboolean(L, 1);
+	} else {
+		lua_pushnil(L);
+	}
+	lua_rawset(L, -3);
+}
+
+/**
+ * Translate integer to poll flags and vice versa
+ */
+static int nixio_poll_flags(lua_State *L) {
+	int flags;
+	if (lua_isnumber(L, 1)) {
+		flags = luaL_checkinteger(L, 1);
+		lua_newtable(L);
+		nixio_poll_flags__r(L, &flags, POLLIN, "in");
+		nixio_poll_flags__r(L, &flags, POLLOUT, "out");
+		nixio_poll_flags__r(L, &flags, POLLERR, "err");
+#ifndef __WINNT__
+		nixio_poll_flags__r(L, &flags, POLLPRI, "pri");
+		nixio_poll_flags__r(L, &flags, POLLHUP, "hup");
+		nixio_poll_flags__r(L, &flags, POLLNVAL, "nval");
+#endif
+	 } else {
+		flags = 0;
+		const int j = lua_gettop(L);
+		for (int i=1; i<=j; i++) {
+			const char *flag = luaL_checkstring(L, i);
+			if (!strcmp(flag, "in")) {
+				flags |= POLLIN;
+			} else if (!strcmp(flag, "out")) {
+				flags |= POLLOUT;
+			} else if (!strcmp(flag, "err")) {
+				flags |= POLLERR;
+			} else if (!strcmp(flag, "pri")) {
+#ifndef __WINNT__
+				flags |= POLLPRI;
+#endif
+			} else if (!strcmp(flag, "hup")) {
+#ifndef __WINNT__
+				flags |= POLLHUP;
+#endif
+			} else if (!strcmp(flag, "nval")) {
+#ifndef __WINNT__
+				flags |= POLLNVAL;
+#endif
+			} else {
+				return luaL_argerror(L, i,
+				 "supported values: in, pri, out, err, hup, nval");
+			}
+		}
+		lua_pushinteger(L, flags);
+	}
+	return 1;
+}
+
+/**
+ * poll({{fd = socket, events = FLAGS}, ...}, timeout)
+ */
+static int nixio_poll(lua_State *L) {
+	int len = lua_objlen(L, 1);
+	int i, fd;
+	int timeout = luaL_optint(L, 2, 0);
+	int status = -1;
+
+	/* we are being abused as sleep() replacement... */
+	if (lua_isnoneornil(L, 1) || len < 1) {
+		if (!poll(NULL, 0, timeout)) {
+			lua_pushinteger(L, 0);
+			return 1;
+		} else {
+			return nixio__perror(L);
+		}
+	}
+
+	luaL_checktype(L, 1, LUA_TTABLE);
+	struct pollfd *fds = calloc(len, sizeof(struct pollfd));
+	if (!fds) {
+		return luaL_error(L, NIXIO_OOM);
+	}
+
+	for (i = 0; i < len; i++) {
+		lua_rawgeti(L, 1, i+1);
+		if (!lua_istable(L, -1)) {
+			free(fds);
+			return luaL_argerror(L, 1, "invalid datastructure");
+		}
+
+		lua_pushliteral(L, "fd");
+		lua_rawget(L, -2);
+		fd = nixio__tofd(L, -1);
+		if (fd == -1) {
+			free(fds);
+			return luaL_argerror(L, 1, "invalid fd in datastructure");
+		}
+		fds[i].fd = fd;
+
+		lua_pushliteral(L, "events");
+		lua_rawget(L, -3);
+		fds[i].events = (short)lua_tointeger(L, -1);
+
+		lua_pop(L, 3);
+	}
+
+	status = poll(fds, (nfds_t)len, timeout);
+
+	if (status == 0) {
+		free(fds);
+		lua_pushboolean(L, 0);
+		return 1;
+	} else if (status < 0) {
+		free(fds);
+		return nixio__perror(L);
+	}
+
+	for (i = 0; i < len; i++) {
+		lua_rawgeti(L, 1, i+1);
+
+		lua_pushliteral(L, "revents");
+		lua_pushinteger(L, fds[i].revents);
+		lua_rawset(L, -3);
+
+		lua_pop(L, 1);
+	}
+
+	free(fds);
+
+	lua_pushinteger(L, status);
+	lua_pushvalue(L, 1);
+
+	return 2;
+}
+
+/* module table */
+static const luaL_reg R[] = {
+	{"gettimeofday", nixio_gettimeofday},
+	{"nanosleep",	nixio_nanosleep},
+	{"poll",		nixio_poll},
+	{"poll_flags",	nixio_poll_flags},
+	{NULL,			NULL}
+};
+
+void nixio_open_poll(lua_State *L) {
+	luaL_register(L, NULL, R);
+}