From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 11 May 2012 06:27:37 +0000 (+0000)
Subject: Support multiple simultaneous fmu simulations (refs #3398)
X-Git-Tag: simantics-1.6~6^2~9
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=c3818e73539a1c366cd954d2630c1c7ab5c7a68f;p=simantics%2Fsysdyn.git

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 4f118dc3..397d6383 100644
--- 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" {
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    loadFMUFile_
- * Signature: (Ljava/lang/String;)I
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_loadFMUFile_1
-  (JNIEnv *, jobject, jstring);
+  (JNIEnv *, jobject, jstring, jstring, jstring);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    setStepLength_
- * Signature: (D)I
+ * Signature: (Ljava/lang/String;D)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setStepLength_1
-  (JNIEnv *, jobject, jdouble);
+  (JNIEnv *, jobject, jstring, jdouble);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    initializeSimulation_
- * Signature: ()I
+ * Signature: (Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_initializeSimulation_1
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    subscribe_
- * Signature: ([Ljava/lang/String;I)I
+ * Signature: (Ljava/lang/String;[Ljava/lang/String;I)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_subscribe_1
-  (JNIEnv *, jobject, jobjectArray, jint);
+  (JNIEnv *, jobject, jstring, jobjectArray, jint);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    setRealValue_
- * Signature: (Ljava/lang/String;D)I
+ * Signature: (Ljava/lang/String;Ljava/lang/String;D)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setRealValue_1
-  (JNIEnv *, jobject, jstring, jdouble);
+  (JNIEnv *, jobject, jstring, jstring, jdouble);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    setIntegerValue_
- * Signature: (Ljava/lang/String;I)I
+ * Signature: (Ljava/lang/String;Ljava/lang/String;I)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setIntegerValue_1
-  (JNIEnv *, jobject, jstring, jint);
+  (JNIEnv *, jobject, jstring, jstring, jint);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    setBooleanValue_
- * Signature: (Ljava/lang/String;Z)I
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Z)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_setBooleanValue_1
-  (JNIEnv *, jobject, jstring, jboolean);
+  (JNIEnv *, jobject, jstring, jstring, jboolean);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    simulateStep_
- * Signature: ()I
+ * Signature: (Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_simulateStep_1
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    getSubscribedResults_
- * Signature: ([D)[D
+ * Signature: (Ljava/lang/String;[D)[D
  */
 JNIEXPORT jdoubleArray JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getSubscribedResults_1
-  (JNIEnv *, jobject, jdoubleArray);
+  (JNIEnv *, jobject, jstring, jdoubleArray);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    unloadFMU_
- * Signature: ()I
+ * Signature: (Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_unloadFMU_1
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    getTime_
- * Signature: ()D
+ * Signature: (Ljava/lang/String;)D
  */
 JNIEXPORT jdouble JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getTime_1
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    getAllVariables_
- * Signature: ()[Ljava/lang/String;
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;
  */
 JNIEXPORT jobjectArray JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getAllVariables_1
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    getLastErrorMessage_
- * Signature: ()Ljava/lang/String;
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getLastErrorMessage_1
-  (JNIEnv *, jobject);
+  (JNIEnv *, jobject, jstring);
 
 /*
  * Class:     org_simantics_modelica_fmi_FMUControlJNI
  * Method:    getRealValue_
- * Signature: (Ljava/lang/String;)D
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)D
  */
 JNIEXPORT jdouble JNICALL Java_org_simantics_modelica_fmi_FMUControlJNI_getRealValue_1
-  (JNIEnv *, jobject, jstring);
+  (JNIEnv *, jobject, jstring, jstring);
 
 #ifdef __cplusplus
 }