From 2ce8e4613e6047a3f2db8abf73271719c78bdef7 Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Mon, 1 Nov 2010 17:54:09 +0000
Subject: [PATCH]

---
 lsyncd-conf.lua | 14 +++++++-------
 lsyncd.lua      | 49 +++++++++++++++++--------------------------------
 2 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/lsyncd-conf.lua b/lsyncd-conf.lua
index 8553934..9ffd885 100644
--- a/lsyncd-conf.lua
+++ b/lsyncd-conf.lua
@@ -22,25 +22,25 @@ slowbash = {
 		return shell([[if [ "$(ls -A $1)" ]; then cp -r "$1"* "$2"; fi]], source, target)
 	end,
 
-	create = function(self, events)
-		local event = events:nextevent()
+	create = function(inlet)
+		local event = inlet:nextevent()
 		log(NORMAL, "create from "..event.spath.." -> "..event.tpath)
 		return shell(prefix..[[cp "$1" "$2"]], event.spath, event.tpath)
 	end,
 
-	modify = function(self, events)
-		local event = events:nextevent()
+	modify = function(inlet)
+		local event = inlet:nextevent()
 		log(NORMAL, "modify from "..event.spath.." -> "..event.tpath)
 		return shell(prefix..[[cp "$1" "$2"]], event.spath, event.tpath)
 	end,
 
-	attrib = function(self, events)
+	attrib = function(self, inlet)
 		-- ignore attribs
 		return 0
 	end,
 
-	delete = function(self, events)
-		local event = events:nextevent()
+	delete = function(inlet)
+		local event = inlet:nextevent()
 		log(NORMAL, "delete "..event.tpath)
 		return exec(prefix..[[rm "$1"]], event.tpath)
 	end,
diff --git a/lsyncd.lua b/lsyncd.lua
index 0081eea..85c5941 100644
--- a/lsyncd.lua
+++ b/lsyncd.lua
@@ -146,7 +146,7 @@ end
 -- Locks globals,
 -- no more globals can be created
 --
-local function global_lock()
+local function globals_lock()
 	local t = _G
 	local mt = getmetatable(t) or {}
 	mt.__newindex = function(t, k, v) 
@@ -221,19 +221,6 @@ local watches = new_count_array()
 local proto_watch = {wd=true, syncs=true}
 local proto_sync  = {origin=true, path=true, parent=true}
 
-
------
--- a dictionary of all processes lsyncd spawned.
---
--- structure
--- [pid] = {
---     origin   .. origin this belongs to
---     delay    .. and the delay which invoked this
---
-local processes = new_count_array()
-local proto_process = {origin=true, delay=true}
-
-
 -----
 -- A list of names of the event types the core sends.
 --
@@ -364,19 +351,22 @@ end
 -- zombie process was collected by core.
 --
 function lsyncd_collect_process(pid, exitcode) 
-	log(DEBUG, "collected "..pid)
-	local process = processes[pid]
-	if not process then
+	local delay = nil
+	local origin = nil
+	for _, o in ipairs(origins) do
+		delay = o.processes[pid]
+		if delay then
+			origin = o
+			break
+		end
+	end
+	if not delay then
 		return
 	end
-	local delay = process.delay
-	local origin = process.origin
-	-- TODO
 	log(DEBUG, "collected "..pid..": "..
 		event_names[delay.atype].." of "..
 		origin.source..delay.pathname..
 		" = "..exitcode)
-	processes[pid] = nil
 	origin.processes[pid] = nil
 end
 
@@ -388,7 +378,7 @@ local hk = {}
 
 ------
 --- TODO
-local events = {
+local inlet = {
 	[hk] = {
 		origin = true,
 		delay  = true,
@@ -429,16 +419,11 @@ local function invoke_action(origin, delay)
 	end
 	
 	if func then
-		events[hk].origin = origin
-		events[hk].delay = delay
-		local pid = func(actions, events)
+		inlet[hk].origin = origin
+		inlet[hk].delay = delay
+		local pid = func(inlet)
 		if pid and pid > 0 then
-			local process = {origin = origin,
-							 delay = delay
-				}
-			set_prototype(process, proto_process)
-			processes[pid] = process
-			o.processes[pid] = process
+			o.processes[pid] = delay
 		end
 	end
 end
@@ -508,7 +493,7 @@ function lsyncd_initialize(args)
 	settings = settings or {}
 
 	-- From this point on, no globals may be created anymore
-	global_lock()
+	globals_lock()
 
 	-- parses all arguments
 	for i = 1, #args do