From: Steven Barth <steven@midlink.org>
Date: Tue, 1 Jul 2008 18:12:34 +0000 (+0000)
Subject: * libs/httpd: Memory optimizations part #1
X-Git-Tag: 0.8.0~719
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=77c7cc65965203e0c2c87bfc37c250e9872872fa

* libs/httpd: Memory optimizations part #1
---

diff --git a/libs/httpd/luasrc/httpd.lua b/libs/httpd/luasrc/httpd.lua
index 9263dcc6d..ac6e29216 100644
--- a/libs/httpd/luasrc/httpd.lua
+++ b/libs/httpd/luasrc/httpd.lua
@@ -30,6 +30,12 @@ local threads = {}
 local threadm = {}
 local threadi = {}
 
+local _meta = {__mode = "k"}
+setmetatable(threads, _meta)
+setmetatable(threadm, _meta)
+setmetatable(threadi, _meta)
+
+
 function Socket(ip, port)
 	local sock, err = socket.bind( ip, port )
 
@@ -86,6 +92,7 @@ function run()
 end
 
 function step()
+	print(collectgarbage("count"))
 	local idle = true
 	if not THREAD_LIMIT or threadc < THREAD_LIMIT then
 		local now = os.time()
@@ -103,10 +110,7 @@ function step()
 		coroutine.resume(thread, client)
 		local now = os.time()
 		if coroutine.status(thread) == "dead" then
-			threads[client] = nil
 			threadc = threadc - 1
-			threadm[client] = nil
-			threadi[client] = nil
 		elseif threadm[client] and threadm[client] + THREAD_TIMEOUT < now then
 			threads[client] = nil
 			threadc = threadc - 1