From 61932c0d0e6e7a9802f01db4776a154ce0e9571c Mon Sep 17 00:00:00 2001 From: Axel Kittenberger Date: Sun, 17 Oct 2010 15:24:55 +0000 Subject: [PATCH] --- lsyncd-conf.lua | 5 ++- lsyncd.c | 103 +++++++++++++++++++++++++++++++++--------------- lsyncd.lua | 75 +++++++++++++++++++++++++++++++---- 3 files changed, 142 insertions(+), 41 deletions(-) diff --git a/lsyncd-conf.lua b/lsyncd-conf.lua index 7cc5d85..a7c1f50 100644 --- a/lsyncd-conf.lua +++ b/lsyncd-conf.lua @@ -1,6 +1,7 @@ settings = { - nodaemon = true, + nodaemon, } -attend_dir("s", "d") +add("s", "d") +-- add("s/s1", "t") diff --git a/lsyncd.c b/lsyncd.c index 8d1ea7f..7feb8c9 100644 --- a/lsyncd.c +++ b/lsyncd.c @@ -30,6 +30,15 @@ */ static int inotify_fd; +/** + * TODO allow configure. + */ +const uint32_t standard_event_mask = + IN_ATTRIB | IN_CLOSE_WRITE | IN_CREATE | + IN_DELETE | IN_DELETE_SELF | IN_MOVED_FROM | + IN_MOVED_TO | IN_DONT_FOLLOW | IN_ONLYDIR; + + /** * Set to TERM or HUP in signal handler, when lsyncd should end or reset ASAP. */ @@ -38,33 +47,20 @@ volatile sig_atomic_t reset = 0; /* the Lua interpreter */ lua_State* L; + /** - * Dumps the LUA stack. For debugging purposes. + * Adds an inotify watch + * + * @param dir path to directory + * @return numeric watch descriptor */ -int stackdump(lua_State* l) +static int +add_watch(lua_State *L) { - int i; - int top = lua_gettop(l); - printf("total in stack %d\n",top); - for (i = 1; i <= top; i++) { - int t = lua_type(l, i); - switch (t) { - case LUA_TSTRING: - printf("%d string: '%s'\n", i, lua_tostring(l, i)); - break; - case LUA_TBOOLEAN: - printf("%d boolean %s\n", i, lua_toboolean(l, i) ? "true" : "false"); - break; - case LUA_TNUMBER: - printf("%d number: %g\n", i, lua_tonumber(l, i)); - break; - default: /* other values */ - printf("%d %s\n", i, lua_typename(l, t)); - break; - } - } - printf("\n"); - return 0; + const char *path = luaL_checkstring(L, 1); + lua_Integer wd = inotify_add_watch(inotify_fd, path, standard_event_mask); + lua_pushinteger(L, wd); + return 1; } @@ -75,7 +71,9 @@ int stackdump(lua_State* l) * @param dir a relative path to directory * @return absolute path of directory */ -static int real_dir(lua_State *L) { +static int +real_dir(lua_State *L) +{ luaL_Buffer b; char *cbuf; const char *rdir = luaL_checkstring(L, 1); @@ -106,13 +104,46 @@ static int real_dir(lua_State *L) { return 1; } +/** + * Dumps the LUA stack. For debugging purposes. + */ +static int +stackdump(lua_State* l) +{ + int i; + int top = lua_gettop(l); + printf("total in stack %d\n",top); + for (i = 1; i <= top; i++) { + int t = lua_type(l, i); + switch (t) { + case LUA_TSTRING: + printf("%d string: '%s'\n", i, lua_tostring(l, i)); + break; + case LUA_TBOOLEAN: + printf("%d boolean %s\n", i, lua_toboolean(l, i) ? "true" : "false"); + break; + case LUA_TNUMBER: + printf("%d number: %g\n", i, lua_tonumber(l, i)); + break; + default: /* other values */ + printf("%d %s\n", i, lua_typename(l, t)); + break; + } + } + printf("\n"); + return 0; +} + + /** * Reads the directories sub directories. * * @param absolute path to directory. * @return a table of directory names. */ -static int sub_dirs (lua_State *L) { +static int +sub_dirs (lua_State *L) +{ const char * dirname = luaL_checkstring(L, 1); DIR *d; int idx = 1; @@ -161,19 +192,24 @@ static int sub_dirs (lua_State *L) { lua_pushstring(L, de->d_name); lua_settable(L, -3); } - return 1; } +static const luaL_reg lsyncdlib[] = { + {"add_watch", add_watch}, + {"real_dir", real_dir}, + {"stackdump", stackdump}, + {"sub_dirs", sub_dirs}, + {NULL, NULL} +}; -int main (int argc, char *argv[]) +int +main(int argc, char *argv[]) { /* load Lua */ L = lua_open(); luaL_openlibs(L); - lua_register(L, "stackdump", stackdump); - lua_register(L, "real_dir", real_dir); - lua_register(L, "sub_dirs", sub_dirs); + luaL_register(L, "lsyncd", lsyncdlib); luaL_loadfile(L, "lsyncd.lua"); if (lua_pcall(L, 0, LUA_MULTRET, 0)) { @@ -195,6 +231,11 @@ int main (int argc, char *argv[]) return -1; // ERRNO } + /* initialize */ + lua_getglobal(L, "lsyncd_initialize"); + lua_call(L, 0, 0); + + /* cleanup */ close(inotify_fd); lua_close(L); return 0; diff --git a/lsyncd.lua b/lsyncd.lua index 3c2b49a..d9f34ef 100644 --- a/lsyncd.lua +++ b/lsyncd.lua @@ -23,20 +23,79 @@ -- lsyncd library functions implemented in LUA ------------------------------------------------------------------------------ +---- +-- Table of all directories to watch. +local origin = {} + +---- +-- all targets +local targets = {} + +----- +-- all watches +local watches = {} + ---- -- Adds watches for a directory including all subdirectories. -- --- @param src --- @param dst +-- @param sdir +-- @param target -- @param ... -function attend_dir(src, dst, ...) - src = real_dir(src); - print("attending dir", src, "->", dst); +local function attend_dir(origin, path, target) + print("attending dir", origin, "+", path, "->", target.dirname); + -- actual dir = origin + path + local op = origin .. path + -- register watch and receive watch descriptor + local wd = lsyncd.add_watch(op); + if wd < 0 then + -- failed adding the watch + -- TODO die? + return + end - local sd = sub_dirs(src); - for k, v in ipairs(sd) do - print("havesub", v); + if watches[wd] ~= nil then + -- this directory is already watched, add the target + local watch = watches[wd] + table.insert(watch.attends, { origin = origin, path = path, target = target }) + else + -- new watch + local watch = {wd = wd, attends = { origin = origin, path = path, target = target } } + watches[wd] = watch + end + + -- register all subdirectories + local subd = lsyncd.sub_dirs(op); + local i, o + for i, v in ipairs(subd) do + attend_dir(origin, path .. v .. "/", target) + end +end + +---- +-- Called from core on init or restart after user configuration. +-- +function lsyncd_initialize() + print("--- INIT ---") + local i, o + for i, o in ipairs(origin) do + print("Handling ", o.source, "->" , o.target) + local target = { dirname = o.target } + table.insert(targets, target) + attend_dir(lsyncd.real_dir(o.source), "", target) end end +------------------------------------------------------------------------------ +-- lsyncd user interface +------------------------------------------------------------------------------ + +---- +-- Add one directory to be watched. +function add(source, target) + local o = { source = source, target = target } + table.insert(origin, o) + return o +end + +