Extend resource lifetime to guarantee process handoff

data/plugins/parsepng/settings.ini

@@ -0,0 +1,4 @@
+[parsepng]
+reserve-ram-max = 5 # max RAM in megabytes
+speed = 1
+runInBackground = 1

plugins/init.cpp

@@ -64,6 +64,9 @@ extern "C" int _fstat(int fd, struct stat *st) {
     return -1;
 }
 
+extern "C" int __ssputws_r (FILE *fp, const wchar_t *buf, size_t len) {return 0;}
+extern "C" int _getentropy(void *buf, size_t buflen){return -1;}
+
 extern "C" void __libc_init_array(void);
 extern uint32_t __data_section_table;
 extern uint32_t __data_section_table_end;

plugins/parsepng/settings.ini

@@ -1,3 +1,4 @@
 [parsepng]
 reserve-ram-max = 5 # max RAM in megabytes
 speed = 1
+runInBackground = 1

src/GLRenderer.cpp

@@ -5,7 +5,7 @@
 
 #include "GLComponentRenderData.hpp"
 #include <cstdint>
-
+#include <algorithm>
 #include <fmt/format.h>
 
 void GLRenderer::init(uint32_t major, uint32_t minor, const std::string profile) {

src/Index.hpp

@@ -70,7 +70,8 @@ class Index {
     static inline Index<Type>* _ptr;
 };
 
-inline Shared<std::vector<std::shared_ptr<void>>> heldResources;
+inline auto heldResources = std::make_unique<Shared<std::vector<std::shared_ptr<void>>>>();
+inline auto nextHeldResources = std::make_unique<Shared<std::vector<std::shared_ptr<void>>>>();
 
 template<typename T>
 class Y : public T {
@@ -89,13 +90,13 @@ class AutoIndex : public std::enable_shared_from_this<Derived> {
         LOG("Creating ", typeid(Derived).name());
         auto ptr = std::make_shared<Y<T>>(std::forward<Args>(args)...);
         ptr->_key = Index<Derived>::_ptr->add(ptr);
-        heldResources.write([&](auto& heldResources){heldResources.push_back(ptr);});
+        heldResources->write()->push_back(ptr);
         return ptr;
     }
 
     ~AutoIndex() {
         LOG("Destroying ", typeid(Derived).name());
-	if (_key)
+	if (_key && Index<Derived>::_ptr)
             Index<Derived>::_ptr->remove(_key);
     }
 
@@ -105,7 +106,9 @@ class AutoIndex : public std::enable_shared_from_this<Derived> {
 };
 
 inline void gc() {
-    heldResources.write([](auto& hr) {
-	hr.clear();
-    });
+    auto hr = heldResources->write();
+    auto nhr = nextHeldResources->write();
+    hr->clear();
+    hr->insert(hr->end(), nhr->begin(), nhr->end());
+    nhr->clear();
 }

src/VMImpl.hpp

@@ -202,6 +202,12 @@ class VMImpl : public VM, public AutoIndex<VMImpl> {
 
 public:
     ~VMImpl() {
+	mainThread([resources=std::move(*heldResources.write())]{
+	    if (nextHeldResources) {
+		auto out = nextHeldResources->write();
+		out->insert(out->end(), resources.begin(), resources.end());
+	    }
+	});
         eventListeners.write([&](auto& eventListeners) {
             for (std::size_t id = 0; id < static_cast<uint32_t>(EventId::MaxEvent); ++id) {
                 for (auto& slot : eventListeners[id]) {