Fixes #220

Author: cnuernber

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Time for a ChangeLog!
+## 2.020
+ * Better support for running with `-Dlibpython_clj.manual_gil=true` - `with-manual-gil`.  
+   Addresses [issue 221](https://github.com/clj-python/libpython-clj/issues/221).
+
 ## 2.019
  * Upgrade to clojure 1.11 as development version.
  * Upgrade dtype-next to get rid of 1.11 warnings (and for unary min,max).

src/libpython_clj2/python.clj

@@ -126,7 +126,7 @@ user> (py/py. np linspace 2 3 :num 10)
 
 (defmacro with-gil
   "Capture the gil for an extended amount of time.  This can greatly speed up
-  operations as the mutex is captured and held once as opposed to find grained
+  operations as the mutex is captured and held once as opposed to fine grained
   grabbing/releasing of the mutex."
   [& body]
   `(py-ffi/with-gil
@@ -146,6 +146,33 @@ user> (py/py. np linspace 2 3 :num 10)
      (pygc/with-stack-context
        ~@body)))
 
+
+(defmacro with-manual-gil
+  "When running with -Dlibpython_clj.manual_gil=true, you need to wrap all accesses to
+  the python runtime with this locker.  This includes calls to require-python or any other
+  pathways.
+
+```clojure
+  (with-manual-gil
+    ...)
+```
+  "
+  [& body]
+  `(with-open [locker# (py-ffi/manual-gil-locker)]
+     ~@body))
+
+
+(defmacro with-manual-gil-stack-rc-context
+  "When running with -Dlibpython_clj.manual_gil=true, you need to wrap all accesses to
+  the python runtime with this locker.  This includes calls to require-python or any other
+  pathways.  This macro furthermore defines a stack-based gc context to immediately release
+  objects when the stack frame exits."
+  [& body]
+  `(with-manual-gil
+     (pygc/with-stack-context
+       ~@body)))
+
+
 (declare ->jvm)
 
 (defn ^:no-doc in-py-ctx

src/libpython_clj2/python/ffi.clj

@@ -737,6 +737,14 @@ Each call must be matched with PyGILState_Release"}
     (PyGILState_Release gilstate)))
 
 
+(defn ^:no-doc manual-gil-locker
+  ^java.lang.AutoCloseable []
+  (let [gil-state (lock-gil)]
+     (reify java.lang.AutoCloseable
+       (close [this]
+         (unlock-gil gil-state)))))
+
+
 (defmacro with-gil
   "Grab the gil and use the main interpreter using reentrant acquire-gil pathway."
   [& body]

test/libpython_clj2/classes_test.clj

@@ -48,3 +48,23 @@
     (is (= {"name" "ACME", "shares" 50, "price" 90}
            (edn/read-string (.toString new-instance))))
     (is (= 116.0 (py/call-attr-kw new-instance "kw_clj_fn" [1 2 3] {:a 20})))))
+
+
+(deftest new-kw-init-cls-test
+  ;;The crux of this is making instance functions to get the 'self' parameter
+  ;;passed in.
+  (let [cls-obj (py/create-class
+                 "Stock" nil
+                 {"__init__" (py/make-kw-instance-fn
+                              (fn [[self :as args] {:as kwargs}]
+                                (py/set-attr! self "kwargs" kwargs)
+                                ;;Because we did not use an arg-converter, all the
+                                ;;arguments above are raw jna Pointers - borrowed
+                                ;;references.
+                                ;;If you don't return nil from __init__ that is an
+                                ;;error.
+                                nil))})
+        new-instance (py/cfn cls-obj "ACME" 50 :a 1 :b 2)
+        dict (py/get-attr new-instance "kwargs")]
+    (is (= {"a" 1 "b" 2}
+           (py/->jvm dict)))))