reaper: close file descriptors at end of Lua handler

CM4all · Dec 4, 2023 · 7f040da · 7f040da
1 parent a07c091
commit 7f040da
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -4,6 +4,7 @@ cm4all-spawn (0.14) unstable; urgency=low
   * split Debian package
   * accessory: implement systemd socket activation
   * reaper: rename "accounting.lua" to "reaper.lua"
+  * reaper: close file descriptors at end of Lua handler
   * systemd: remove "WantedBy=multi-user.target"
 
  --   

diff --git a/libcommon b/libcommon
diff --git a/src/reaper/LAccounting.cxx b/src/reaper/LAccounting.cxx
@@ -5,6 +5,7 @@
 #include "LAccounting.hxx"
 #include "CgroupAccounting.hxx"
 #include "lua/Assert.hxx"
+#include "lua/AutoClose.hxx"
 #include "lua/CoRunner.hxx"
 #include "lua/Resume.hxx"
 #include "lua/io/XattrTable.hxx"
@@ -29,6 +30,11 @@ class LuaAccounting::Thread final
 		:runner(L) {}
 
 	~Thread() noexcept {
+		auto *L = runner.GetMainState();
+		runner.Push(L);
+		AutoClose(L, RelativeStackIndex{-1});
+		lua_pop(L, 1);
+
 		runner.Cancel();
 	}
 
@@ -61,6 +67,7 @@ Push(lua_State *L, UniqueFileDescriptor &&cgroup_fd,
 
 	if (cgroup_fd.IsDefined()) {
 		NewXattrTable(L, std::move(cgroup_fd));
+		AddAutoClose(L, CurrentThread{}, RelativeStackIndex{-1});
 		lua_setfield(L, -2, "cgroup_xattr");
 	}
+129 −0		src/lua/AutoClose.hxx
+47 −0		src/lua/Close.hxx
+2 −24		src/lua/CoCancel.cxx
+7 −0		src/lua/CoRunner.hxx
+7 −0		src/lua/Thread.hxx
+19 −0		src/lua/io/XattrTable.cxx