Commit from LuCI Translation Portal by user jow.: 10 of 222 messages translated ...

[project/luci.git] / libs / lucid / luasrc / lucid.lua

diff --git a/libs/lucid/luasrc/lucid.lua b/libs/lucid/luasrc/lucid.lua
index e1d7322..38b34fd 100644 (file)
--- a/libs/lucid/luasrc/lucid.lua
+++ b/libs/lucid/luasrc/lucid.lua
@@ -136,7 +136,6 @@ function run()
                        end
                elseif stat == 0 then
                        ifaddrs = nixio.getifaddrs()
-                       collectgarbage("collect")
                end
                
                for _, cb in ipairs(tickt) do
@@ -145,9 +144,13 @@ function run()
                
                local pid, stat, code = nixio.wait(-1, "nohang")
                while pid and pid > 0 do
-                       tcount = tcount - 1
-                       if tpids[pid] and tpids[pid] ~= true then
-                               tpids[pid](pid, stat, code)
+                       nixio.syslog("info", "Buried thread: " .. pid)
+                       if tpids[pid] then
+                               tcount = tcount - 1
+                               if tpids[pid] ~= true then
+                                       tpids[pid](pid, stat, code)
+                               end
+                               tpids[pid] = nil
                        end
                        pid, stat, code = nixio.wait(-1, "nohang")
                end
@@ -228,10 +231,13 @@ function create_process(threadcb, waitcb)
        if threadlimit and tcount >= threadlimit then
                nixio.syslog("warning", "Cannot create thread: process limit reached")
                return nil
+       else
+               collectgarbage("collect")
        end
        local pid, code, err = nixio.fork()
        if pid and pid ~= 0 then
-               tpids[pid] = waitcb
+               nixio.syslog("info", "Created thread: " .. pid)
+               tpids[pid] = waitcb or true
                tcount = tcount + 1
        elseif pid == 0 then
                local code = threadcb()