Support multiple simultaneous fmu simulations (refs #3398)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@24940 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.modelica/src/org_simantics_modelica_fmi_FMUControlJNI.h b/org.simantics.modelica/src/org_simantics_modelica_fmi_FMUControlJNI.h
index 4f118dc3f32042867577814bc6dfe9a83c7e09d7..397d63832b2a5122500d0eee2e34d232d1d9f338 100644 (file)
--- a/org.simantics.modelica/src/org_simantics_modelica_fmi_FMUControlJNI.h
+++ b/org.simantics.modelica/src/org_simantics_modelica_fmi_FMUControlJNI.h
@@ -10,114 +10,114 @@ extern "C" {
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    loadFMUFile_\r
- * Signature: (Ljava/lang/String;)I\r
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_loadFMUFile_1\r
-  (JNIEnv *, jobject, jstring);\r
+  (JNIEnv *, jobject, jstring, jstring, jstring);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    setStepLength_\r
- * Signature: (D)I\r
+ * Signature: (Ljava/lang/String;D)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setStepLength_1\r
-  (JNIEnv *, jobject, jdouble);\r
+  (JNIEnv *, jobject, jstring, jdouble);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    initializeSimulation_\r
- * Signature: ()I\r
+ * Signature: (Ljava/lang/String;)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_initializeSimulation_1\r
-  (JNIEnv *, jobject);\r
+  (JNIEnv *, jobject, jstring);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    subscribe_\r
- * Signature: ([Ljava/lang/String;I)I\r
+ * Signature: (Ljava/lang/String;[Ljava/lang/String;I)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_subscribe_1\r
-  (JNIEnv *, jobject, jobjectArray, jint);\r
+  (JNIEnv *, jobject, jstring, jobjectArray, jint);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    setRealValue_\r
- * Signature: (Ljava/lang/String;D)I\r
+ * Signature: (Ljava/lang/String;Ljava/lang/String;D)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setRealValue_1\r
-  (JNIEnv *, jobject, jstring, jdouble);\r
+  (JNIEnv *, jobject, jstring, jstring, jdouble);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    setIntegerValue_\r
- * Signature: (Ljava/lang/String;I)I\r
+ * Signature: (Ljava/lang/String;Ljava/lang/String;I)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setIntegerValue_1\r
-  (JNIEnv *, jobject, jstring, jint);\r
+  (JNIEnv *, jobject, jstring, jstring, jint);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    setBooleanValue_\r
- * Signature: (Ljava/lang/String;Z)I\r
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Z)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setBooleanValue_1\r
-  (JNIEnv *, jobject, jstring, jboolean);\r
+  (JNIEnv *, jobject, jstring, jstring, jboolean);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    simulateStep_\r
- * Signature: ()I\r
+ * Signature: (Ljava/lang/String;)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_simulateStep_1\r
-  (JNIEnv *, jobject);\r
+  (JNIEnv *, jobject, jstring);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    getSubscribedResults_\r
- * Signature: ([D)[D\r
+ * Signature: (Ljava/lang/String;[D)[D\r
  */\r
 JNIEXPORT jdoubleArray JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getSubscribedResults_1\r
-  (JNIEnv *, jobject, jdoubleArray);\r
+  (JNIEnv *, jobject, jstring, jdoubleArray);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    unloadFMU_\r
- * Signature: ()I\r
+ * Signature: (Ljava/lang/String;)I\r
  */\r
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_unloadFMU_1\r
-  (JNIEnv *, jobject);\r
+  (JNIEnv *, jobject, jstring);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    getTime_\r
- * Signature: ()D\r
+ * Signature: (Ljava/lang/String;)D\r
  */\r
 JNIEXPORT jdouble JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getTime_1\r
-  (JNIEnv *, jobject);\r
+  (JNIEnv *, jobject, jstring);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    getAllVariables_\r
- * Signature: ()[Ljava/lang/String;\r
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;\r
  */\r
 JNIEXPORT jobjectArray JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getAllVariables_1\r
-  (JNIEnv *, jobject);\r
+  (JNIEnv *, jobject, jstring);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    getLastErrorMessage_\r
- * Signature: ()Ljava/lang/String;\r
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;\r
  */\r
 JNIEXPORT jstring JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getLastErrorMessage_1\r
-  (JNIEnv *, jobject);\r
+  (JNIEnv *, jobject, jstring);\r
 \r
 /*\r
  * Class:     org_simantics_modelica_fmi_FMUControlJNI\r
  * Method:    getRealValue_\r
- * Signature: (Ljava/lang/String;)D\r
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)D\r
  */\r
 JNIEXPORT jdouble JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getRealValue_1\r
-  (JNIEnv *, jobject, jstring);\r
+  (JNIEnv *, jobject, jstring, jstring);\r
 \r
 #ifdef __cplusplus\r
 }\r