From 941741c6f7ec4924962c2267b1756ff926559cc4 Mon Sep 17 00:00:00 2001
From: Timo Korvola <Timo.Korvola@vtt.fi>
Date: Mon, 30 Jan 2017 11:13:48 +0200
Subject: [PATCH] All variable setters now use GIL.

Most setters are now defined by a CPP macro.  It is not pretty and may
well be the ugliest way to do this except for the one it replaces.

Change-Id: I27d36bfef6252f78ee801ebbc022d6fe75a3b49c
---
 .../jnipython.dll                             | Bin 62976 -> 63488 bytes
 .../src/sclpy.c                               | 141 ++++++------------
 2 files changed, 45 insertions(+), 96 deletions(-)

diff --git a/org.simantics.pythonlink.win32.x86_64/jnipython.dll b/org.simantics.pythonlink.win32.x86_64/jnipython.dll
index 37e45770533af445a425847d0cc431e9065461ac..a605b4e9da45bd49bbe4119bef0885bb37f6b1c7 100644
GIT binary patch
delta 8776
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

delta 8493
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
T!l{oGmf}eg;bf8iSCRe?zjZc_

diff --git a/org.simantics.pythonlink.win32.x86_64/src/sclpy.c b/org.simantics.pythonlink.win32.x86_64/src/sclpy.c
index 1cc36d8..e767192 100644
--- a/org.simantics.pythonlink.win32.x86_64/src/sclpy.c
+++ b/org.simantics.pythonlink.win32.x86_64/src/sclpy.c
@@ -785,97 +785,39 @@ jobject pythonDictionaryAsMap(JNIEnv *env, PyObject *dict) {
 	return map;
 }
 
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonBooleanVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jboolean value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonBool(value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonBooleanArrayVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jbooleanArray value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonBooleanList(env, value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonLongVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jlong value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = PyLong_FromLongLong(value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonIntegerArrayVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jintArray value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonIntegerList(env, value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonLongArrayVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jlongArray value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonLongList(env, value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonDoubleVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jdouble value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = PyFloat_FromDouble(value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonFloatArrayVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jfloatArray value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonFloatList(env, value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonDoubleArrayVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jdoubleArray value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonDoubleList(env, value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonStringVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jstring value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonString(env, value);
-
-	setPythonVariable(module, pythonName, val);
-}
-
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonStringArrayVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jobjectArray value) {
-	PyObject *module = (PyObject*)contextID;
-
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonStringList(env, value);
-
-	setPythonVariable(module, pythonName, val);
-}
+#define DEF_SETTER(typename, jtype, j2py)                               \
+    JNIEXPORT void JNICALL                                              \
+    Java_org_simantics_pythonlink_PythonContext_setPython               \
+		    ##typename##VariableImpl(                                   \
+        JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, \
+        jtype value) {                                                  \
+            PyObject *module = (PyObject*)contextID;                    \
+                                                                        \
+            PyEval_RestoreThread(main_ts);                              \
+            setPythonVariable(module, getPythonString(env, variableName), \
+                              j2py(env, value));                        \
+            PyEval_SaveThread();                                        \
+    }
 
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonNDArrayVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jobject value) {
+#define getPythonBoolean(env, value) getPythonBool(value)
+#define getPythonLong(env, value) PyLong_FromLongLong(value)
+#define getPythonDouble(env, value) PyFloat_FromDouble(value)
+
+DEF_SETTER(Boolean, jboolean, getPythonBoolean)
+DEF_SETTER(BooleanArray, jbooleanArray, getPythonBooleanList)
+DEF_SETTER(Long, jlong, getPythonLong)
+DEF_SETTER(IntegerArray, jintArray, getPythonIntegerList)
+DEF_SETTER(LongArray, jlongArray, getPythonLongList)
+DEF_SETTER(Double, jdouble, getPythonDouble)
+DEF_SETTER(FloatArray, jfloatArray, getPythonFloatList)
+DEF_SETTER(DoubleArray, jdoubleArray, getPythonDoubleList)
+DEF_SETTER(String, jstring, getPythonString)
+DEF_SETTER(StringArray, jobjectArray, getPythonStringList)
+
+JNIEXPORT void JNICALL
+Java_org_simantics_pythonlink_PythonContext_setPythonNDArrayVariableImpl(
+		JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName,
+		jobject value) {
 	PyObject *module = (PyObject*)contextID;
 
 	if (!hasNumpy) {
@@ -883,24 +825,31 @@ JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonNDAr
 		return;
 	}
 
+	PyEval_RestoreThread(main_ts);
 	{
 		PyObject *pythonName = getPythonString(env, variableName);
 		PyObject *val = getPythonNDArray(env, value);
 
 		setPythonVariable(module, pythonName, val);
 	}
+	PyEval_SaveThread();
 }
 
-JNIEXPORT void JNICALL Java_org_simantics_pythonlink_PythonContext_setPythonVariantVariableImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName, jobject value, jobject binding) {
+JNIEXPORT void JNICALL
+Java_org_simantics_pythonlink_PythonContext_setPythonVariantVariableImpl(
+		JNIEnv *env, jobject thisObj, jlong contextID, jstring variableName,
+		jobject value, jobject binding) {
 	PyObject *module = (PyObject*)contextID;
 
-	PyObject *pythonName = getPythonString(env, variableName);
-	PyObject *val = getPythonObject(env, value, binding);
-
-	setPythonVariable(module, pythonName, val);
+	PyEval_RestoreThread(main_ts);
+	setPythonVariable(module, getPythonString(env, variableName),
+					  getPythonObject(env, value, binding));
+	PyEval_SaveThread();
 }
 
-JNIEXPORT jint JNICALL Java_org_simantics_pythonlink_PythonContext_executePythonStatementImpl(JNIEnv *env, jobject thisObj, jlong contextID, jstring statement) {
+JNIEXPORT jint JNICALL
+Java_org_simantics_pythonlink_PythonContext_executePythonStatementImpl(
+		JNIEnv *env, jobject thisObj, jlong contextID, jstring statement) {
 	PyObject *module = (PyObject*)contextID;
 
 	const char *utfchars = (*env)->GetStringUTFChars(env, statement, NULL);
-- 
2.45.2