From 43fe2820f5a928d75bdf605255efd1907cd01485 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 20 Apr 2014 20:23:53 +1000 Subject: Added LumbrJack (logging) and Runnr (Lua function / script runner). --- LumbrJack/LumbrJack.c | 82 +++++++++++++ LumbrJack/LumbrJack.h | 38 ++++++ LumbrJack/build.lua | 21 ++++ Runnr/Runnr.c | 318 ++++++++++++++++++++++++++++++++++++++++++++++++++ Runnr/Runnr.h | 15 +++ Runnr/build.lua | 21 ++++ build.lua | 2 + 7 files changed, 497 insertions(+) create mode 100644 LumbrJack/LumbrJack.c create mode 100644 LumbrJack/LumbrJack.h create mode 100755 LumbrJack/build.lua create mode 100644 Runnr/Runnr.c create mode 100644 Runnr/Runnr.h create mode 100755 Runnr/build.lua diff --git a/LumbrJack/LumbrJack.c b/LumbrJack/LumbrJack.c new file mode 100644 index 0000000..9760766 --- /dev/null +++ b/LumbrJack/LumbrJack.c @@ -0,0 +1,82 @@ +/* LumbrJack - a logging library that wraps Eina logging. + +*/ + + +#include "LumbrJack.h" + + +static char dateTime[DATE_TIME_LEN]; + +static void _ggg_log_print_cb(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args) +{ + FILE *f = data; + char dt[DATE_TIME_LEN + 1]; + char fileTab[256], funcTab[256]; + + getDateTime(NULL, dt, NULL); + dt[19] = '\0'; + if (12 > strlen(file)) + snprintf(fileTab, sizeof(fileTab), "%s\t\t", file); + else + snprintf(fileTab, sizeof(fileTab), "%s\t", file); + snprintf(funcTab, sizeof(funcTab), "\t%s", fnc); + fprintf(f, "%s ", dt); + if (f == stderr) + eina_log_print_cb_stderr(d, level, fileTab, funcTab, line, fmt, data, args); + else if (f == stdout) + eina_log_print_cb_stdout(d, level, fileTab, funcTab, line, fmt, data, args); + fflush(f); +} + +int loggingStartup(char *name, int logDom) +{ + if (logDom < 0) + { + logDom = eina_log_domain_register(name, NULL); + if (logDom < 0) + { + EINA_LOG_CRIT("could not register log domain '%s'", name); + return logDom; + } + } + eina_log_level_set(EINA_LOG_LEVEL_DBG); + eina_log_domain_level_set(name, EINA_LOG_LEVEL_DBG); + eina_log_print_cb_set(_ggg_log_print_cb, stderr); + + // Shut up the excess debugging shit from EFL. + eina_log_domain_level_set("eo", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("eldbus", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("eet", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("ecore", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("ecore_audio", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("ecore_con", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("ecore_input_evas", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("ecore_input_evas", EINA_LOG_LEVEL_WARN); + eina_log_domain_level_set("ecore_system_upower", EINA_LOG_LEVEL_WARN); + + return logDom; +} + +char *getDateTime(struct tm **nowOut, char *dateOut, time_t *timeOut) +{ + struct tm *newTime; + time_t szClock; + char *date = dateTime; + + // Get time in seconds + time(&szClock); + // Convert time to struct tm form + newTime = localtime(&szClock); + + if (nowOut) + *nowOut = newTime; + if (dateOut) + date = dateOut; + if (timeOut) + *timeOut = szClock; + + // format + strftime(date, DATE_TIME_LEN, "%d/%m/%Y %H:%M:%S\r", newTime); + return (dateTime); +} diff --git a/LumbrJack/LumbrJack.h b/LumbrJack/LumbrJack.h new file mode 100644 index 0000000..4a3290c --- /dev/null +++ b/LumbrJack/LumbrJack.h @@ -0,0 +1,38 @@ + +#include +#include + +#include + + +#define PC(...) EINA_LOG_DOM_CRIT(ourGlobals->logDom, __VA_ARGS__) +#define PE(...) EINA_LOG_DOM_ERR(ourGlobals->logDom, __VA_ARGS__) +#define PW(...) EINA_LOG_DOM_WARN(ourGlobals->logDom, __VA_ARGS__) +#define PD(...) EINA_LOG_DOM_DBG(ourGlobals->logDom, __VA_ARGS__) +#define PI(...) EINA_LOG_DOM_INFO(ourGlobals->logDom, __VA_ARGS__) + +#define PCm(...) EINA_LOG_DOM_CRIT(ourGlobals.logDom, __VA_ARGS__) +#define PEm(...) EINA_LOG_DOM_ERR(ourGlobals.logDom, __VA_ARGS__) +#define PWm(...) EINA_LOG_DOM_WARN(ourGlobals.logDom, __VA_ARGS__) +#define PDm(...) EINA_LOG_DOM_DBG(ourGlobals.logDom, __VA_ARGS__) +#define PIm(...) EINA_LOG_DOM_INFO(ourGlobals.logDom, __VA_ARGS__) + +#define D() PD("DEBUG") + + +// "01:03:52 01-01-1973\n\0" +#define DATE_TIME_LEN 21 + + +#ifndef FALSE +// NEVER change this +typedef enum +{ + FALSE = 0, + TRUE = 1 +} boolean; +#endif + + +int loggingStartup(char *name, int logDom); +char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); diff --git a/LumbrJack/build.lua b/LumbrJack/build.lua new file mode 100755 index 0000000..3181bef --- /dev/null +++ b/LumbrJack/build.lua @@ -0,0 +1,21 @@ +#!/usr/bin/env lua + +local dir = ... + +if 'nil' == type(dir) then + local build, err = loadfile('../build.lua') + if build then + setfenv(build, getfenv(2)) + build('') + else + print("ERROR - " .. err) + end + dir = workingDir +end + +LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS + +removeFiles(dir, {'LumbrJack.o', 'libLumbrJack.so'}) + +runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c LumbrJack.c') +runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libLumbrJack.so -o libLumbrJack.so LumbrJack.o') diff --git a/Runnr/Runnr.c b/Runnr/Runnr.c new file mode 100644 index 0000000..a24e7f5 --- /dev/null +++ b/Runnr/Runnr.c @@ -0,0 +1,318 @@ +/* Runnr - a library that deals with running Lua scripts. + +*/ + + +#include "Runnr.h" + + +void dumpStack(lua_State *L, int i) +{ + int type = lua_type(L, i); + + switch (type) + { + case LUA_TNONE : printf("Stack %d is empty\n", i); break; + case LUA_TNIL : printf("Stack %d is a nil\n", i); break; + case LUA_TBOOLEAN : printf("Stack %d is a boolean - %d\n", i, lua_toboolean(L, i)); break; + case LUA_TNUMBER : printf("Stack %d is a number\n - %f", i, lua_tonumber(L, i)); break; + case LUA_TSTRING : printf("Stack %d is a string - %s\n", i, lua_tostring(L, i)); break; + case LUA_TFUNCTION : printf("Stack %d is a function\n", i); break; + case LUA_TTHREAD : printf("Stack %d is a thread\n", i); break; + case LUA_TTABLE : + { + int j; + + printf("Stack %d is a table", i); + lua_getfield(L, i, "_NAME"); + j = lua_gettop(L); + if (lua_isstring(L, j)) + printf(" - %s", lua_tostring(L, j)); + lua_pop(L, 1); + printf("\n"); + break; + } + case LUA_TUSERDATA : printf("Stack %d is a userdata\n", i); break; + case LUA_TLIGHTUSERDATA : printf("Stack %d is a light userdata\n", i); break; + default : printf("Stack %d is unknown\n", i); break; + } +} + + +// These are what the various symbols are for each type - +// int % +// num # +// str $ +// bool ! +// C func & +// table.field @ Expects an integer and a string. +// nil ~ +// table {} Starts and stops filling up a new table. +// ( Just syntax sugar for call. +// call ) Expects an integer, the number of results left after the call. +// FIXME: Still to do, if we ever use them - +// stack = Get a value from the stack, expects a stack index. +// userdata + +// lightuserdata * +// thread ^ + +static char *_push_name(lua_State *L, char *q, int *idx) // Stack usage [-0, +1, e or m] +{ + char *p = q; + char temp = '\0'; + + // A simplistic scan through an identifier, it's wrong, but it's quick, + // and we don't mind that it's wrong, coz this is only internal. + while (isalnum((int)*q)) + q++; + temp = *q; + *q = '\0'; + if (*idx > 0) + lua_getfield(L, *idx, p); // Stack usage [-0, +1, e] + else + { + if (p != q) + lua_pushstring(L, p); // Stack usage [-0, +1, m] + else + { + lua_pushnumber(L, (lua_Number) (0 - (*idx))); + (*idx)--; + } + } + *q = temp; + + return q; +} + +int pull_lua(lua_State *L, int i, char *params, ...) // Stack usage - + // if i is a table + // [-n, +n, e] + // else + // [-0, +0, -] +{ + va_list vl; + char *f = strdup(params); + char *p = f; + int n = 0, j = i, count = 0; + Eina_Bool table = EINA_FALSE; + + if (!f) return -1; + va_start(vl, params); + + if (lua_istable(L, i)) // Stack usage [-0, +0, -] + { + j = -1; + table = EINA_TRUE; + } + + while (*p) + { + char *q; + Eina_Bool get = EINA_TRUE; + + while (isspace((int)*p)) + p++; + q = p + 1; + switch (*p) + { + case '%': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, e] + if (lua_isnumber(L, j)) // Stack usage [-0, +0, -] + { + int *v = va_arg(vl, int *); + *v = lua_tointeger(L, j); // Stack usage [-0, +0, -] + n++; + } + break; + } + case '#': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, e] + if (lua_isnumber(L, j)) // Stack usage [-0, +0, -] + { + double *v = va_arg(vl, double *); + *v = lua_tonumber(L, j); // Stack usage [-0, +0, -] + n++; + } + break; + } + case '$': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, e] + if (lua_isstring(L, j)) // Stack usage [-0, +0, -] + { + char **v = va_arg(vl, char **); + size_t len; + char *temp = (char *) lua_tolstring(L, j, &len); // Stack usage [-0, +0, m] + + len++; // Cater for the null at the end. + *v = malloc(len); + if (*v) + { + memcpy(*v, temp, len); + n++; + } + } + break; + } + case '!': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, e] + if (lua_isboolean(L, j)) // Stack usage [-0, +0, -] + { + int *v = va_arg(vl, int *); + *v = lua_toboolean(L, j); // Stack usage [-0, +0, -] + n++; + } + break; + } + default: + { + get = EINA_FALSE; + break; + } + } + + if (get) + { + if (table) + { + // If this is a table, then we pushed a value on the stack, pop it off. + lua_pop(L, 1); // Stack usage [-n, +0, -] + } + else + j++; + count++; + } + p = q; + } + + va_end(vl); + free(f); + if (count > n) + n = 0; + else if (table) + n = 1; + return n; +} + +int push_lua(lua_State *L, char *params, ...) // Stack usage [-0, +n, em] +{ + va_list vl; + char *f = strdup(params); + char *p = f; + int n = 0, table = 0, i = -1; + + if (!f) return -1; + + va_start(vl, params); + + while (*p) + { + char *q; + Eina_Bool set = EINA_TRUE; + + while (isspace((int)*p)) + p++; + q = p + 1; + switch (*p) + { + case '%': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_pushinteger(L, va_arg(vl, int)); // Stack usage [-0, +1, -] + break; + } + case '#': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_pushnumber(L, va_arg(vl, double)); // Stack usage [-0, +1, -] + break; + } + case '$': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_pushstring(L, va_arg(vl, char *)); // Stack usage [-0, +1, m] + break; + } + case '!': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_pushboolean(L, va_arg(vl, int)); // Stack usage [-0, +1, -] + break; + } + case '=': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_pushvalue(L, va_arg(vl, int)); // Stack usage [-0, +1, -] + break; + } + case '@': + { + int tabl = va_arg(vl, int); + char *field = va_arg(vl, char *); + + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_getfield(L, tabl, field); // Stack usage [-0, +1, e] + break; + } + case '&': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_pushcfunction(L, va_arg(vl, void *)); // Stack usage [-0, +1, m] + break; + } + case '~': + { + if (table) q = _push_name(L, q, &i); // Stack usage [-0, +1, m] + lua_pushnil(L); // Stack usage [-0, +1, -] + break; + } + case '(': // Just syntax sugar. + { + set = EINA_FALSE; + break; + } + case ')': + { + lua_call(L, n - 1, va_arg(vl, int)); + n = 0; + set = EINA_FALSE; + break; + } + case '{': + { + lua_newtable(L); + table++; + n++; + set = EINA_FALSE; + break; + } + case '}': + { + table--; + set = EINA_FALSE; + break; + } + default: + { + set = EINA_FALSE; + break; + } + } + + if (set) + { + if (table > 0) + lua_settable(L, -3); // Stack usage [-2, +0, e] + else + n++; + } + p = q; + } + + va_end(vl); + free(f); + return n; +} diff --git a/Runnr/Runnr.h b/Runnr/Runnr.h new file mode 100644 index 0000000..dc720ff --- /dev/null +++ b/Runnr/Runnr.h @@ -0,0 +1,15 @@ + +#include +#include + +#include + +#include +#include +#include +#include + + +void dumpStack(lua_State *L, int i); +int pull_lua(lua_State *L, int i, char *params, ...); +int push_lua(lua_State *L, char *params, ...); diff --git a/Runnr/build.lua b/Runnr/build.lua new file mode 100755 index 0000000..4384376 --- /dev/null +++ b/Runnr/build.lua @@ -0,0 +1,21 @@ +#!/usr/bin/env lua + +local dir = ... + +if 'nil' == type(dir) then + local build, err = loadfile('../build.lua') + if build then + setfenv(build, getfenv(2)) + build('') + else + print("ERROR - " .. err) + end + dir = workingDir +end + +LDFLAGS = '-L ' .. dir .. ' ' .. LDFLAGS + +removeFiles(dir, {'Runnr.o', 'libRunnr.so'}) + +runCommand('C libraries', dir, 'gcc ' .. CFLAGS .. ' -fPIC -c Runnr.c') +runCommand(nil, dir, 'gcc ' .. CFLAGS .. ' -shared -Wl,-soname,libRunnr.so -o libRunnr.so Runnr.o') diff --git a/build.lua b/build.lua index 581c134..c6b0748 100755 --- a/build.lua +++ b/build.lua @@ -86,6 +86,8 @@ if 'nil' == type(args) then print('_______________ BUILDING Irrlicht _______________') -- Irrlicht is an external project that comes with make files anyway, and doesn't otherwise pass the test. runCommand('Irrlicht', 'libraries/irrlicht-1.8.1/source/Irrlicht', 'make') + buildSub('LumbrJack', 'LumbrJack') + buildSub('Runnr', 'Runnr') buildSub('LuaSL', 'LuaSL') buildSub('GuiLua', 'ClientHamr/GuiLua') buildSub('extantz', 'ClientHamr/extantz') -- cgit v1.1