Merge pull request #221 from Distributive-Network/philippe/176-211-201-cleanup

TODOS for improved memory management and minor improvements

Author: philippedistributive

.github/workflows/test-and-publish.yaml

@@ -40,7 +40,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.7.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
       - name: Setup XCode
         if: ${{ matrix.os == 'macos-13' && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
@@ -60,7 +60,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.7.0-${{ runner.os }}-${{ runner.arch }}
           lookup-only: true # skip download
       - name: Install dependencies
         if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
@@ -141,7 +141,7 @@ jobs:
         with:
           path: |
             ./_spidermonkey_install/*
-          key: spidermonkey115.1.0-${{ runner.os }}-${{ runner.arch }}
+          key: spidermonkey115.7.0-${{ runner.os }}-${{ runner.arch }}
           fail-on-cache-miss: true # SpiderMonkey is expected to be cached in its dedicated job
       - name: Build pminit
         run: |

build.py

@@ -40,7 +40,7 @@ def run_cmake_build():
     if platform.system() == "Windows":
         execute("cmake .. -T ClangCL", cwd=BUILD_DIR) # use Clang/LLVM toolset for Visual Studio
     else:
-        execute("cmake ..", cwd=BUILD_DIR)
+        execute("cmake .. -DPYTHON_INCLUDE_DIR=$(python -c 'import sysconfig; print(sysconfig.get_path('include'))') -DPYTHON_LIBRARY=$(python -c 'import sysconfig; print(sysconfig.get_config_var('LIBDIR'))')", cwd=BUILD_DIR)
     execute(f"cmake --build . -j{CPUS} --config Release", cwd=BUILD_DIR)
 
 def copy_artifacts():

src/PyDictProxyHandler.cc

@@ -167,8 +167,18 @@ bool PyDictProxyHandler::getOwnEnumerablePropertyKeys(
   return this->ownPropertyKeys(cx, proxy, props);
 }
 
-// @TODO (Caleb Aikens) implement this
-void PyDictProxyHandler::finalize(JS::GCContext *gcx, JSObject *proxy) const {}
+// TODO not needed at this time since only called as part of cleanup function's js::DestroyContext call which is only called at cpython exit Py_AtExit in PyInit_pythonmonkey
+// put in some combination of the commented-out code below
+void PyDictProxyHandler::finalize(JS::GCContext *gcx, JSObject *proxy) const {
+  /*PyThreadState *state = PyThreadState_Get(); 
+  PyThreadState *state = PyGILState_GetThisThreadState();
+  if (state) {
+    PyObject *self = JS::GetMaybePtrFromReservedSlot<PyObject>(proxy, PyObjectSlot);
+    PyGILState_STATE state = PyGILState_Ensure();
+    Py_DECREF(self);
+    PyGILState_Release(state);
+  }*/
+}
 
 bool PyDictProxyHandler::defineProperty(JSContext *cx, JS::HandleObject proxy,
   JS::HandleId id,

src/PyListProxyHandler.cc

@@ -2098,8 +2098,17 @@ bool PyListProxyHandler::getOwnPropertyDescriptor(
   return true;
 }
 
+// TODO not needed at this time since only called as part of cleanup function's js::DestroyContext call which is only called at cpython exit Py_AtExit in PyInit_pythonmonkey
+// put in some combination of the commented-out code below
 void PyListProxyHandler::finalize(JS::GCContext *gcx, JSObject *proxy) const {
-  JS::SetReservedSlot(proxy, PyObjectSlot, JS::PrivateValue(nullptr));
+  /*PyThreadState *state = PyThreadState_Get(); 
+  PyThreadState *state = PyGILState_GetThisThreadState();
+  if (state) {
+    PyObject *self = JS::GetMaybePtrFromReservedSlot<PyObject>(proxy, PyObjectSlot);
+    PyGILState_STATE state = PyGILState_Ensure();
+    Py_DECREF(self);
+    PyGILState_Release(state);
+  }*/
 }
 
 bool PyListProxyHandler::defineProperty(