From 591d1f1de204ef7303e6d02c88ae4c7f59c564de Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 14 Mar 2016 22:34:05 +0100 Subject: [PATCH] cleanups in java bindings --- src/bindings/java/JavaContext.cpp | 4 +- src/bindings/java/jmsg.cpp | 69 +++------ src/bindings/java/jmsg.h | 43 ++---- src/bindings/java/jmsg_as.cpp | 20 +-- src/bindings/java/jmsg_as.h | 16 +-- src/bindings/java/jmsg_comm.cpp | 21 ++- src/bindings/java/jmsg_comm.h | 18 +-- src/bindings/java/jmsg_file.cpp | 23 ++- src/bindings/java/jmsg_file.h | 20 ++- src/bindings/java/jmsg_host.cpp | 73 ++++------ src/bindings/java/jmsg_host.h | 106 ++++++-------- src/bindings/java/jmsg_process.cpp | 103 +++++--------- src/bindings/java/jmsg_process.h | 146 ++++++++----------- src/bindings/java/jmsg_rngstream.cpp | 47 +++---- src/bindings/java/jmsg_rngstream.h | 34 ++--- src/bindings/java/jmsg_storage.cpp | 26 ++-- src/bindings/java/jmsg_storage.h | 61 +++----- src/bindings/java/jmsg_synchro.cpp | 37 ++--- src/bindings/java/jmsg_synchro.h | 40 ++---- src/bindings/java/jmsg_task.cpp | 200 +++++++++------------------ src/bindings/java/jmsg_task.h | 160 +++++++++------------ src/bindings/java/jmsg_vm.cpp | 94 +++++++------ src/bindings/java/jmsg_vm.h | 76 +++++----- src/bindings/java/jtrace.cpp | 57 ++++---- src/bindings/java/jtrace.h | 108 ++++++--------- src/bindings/java/jxbt_utilities.cpp | 111 ++++----------- src/bindings/java/jxbt_utilities.h | 45 ++---- 27 files changed, 646 insertions(+), 1112 deletions(-) diff --git a/src/bindings/java/JavaContext.cpp b/src/bindings/java/JavaContext.cpp index cce9499f5c..f5f0ffcb24 100644 --- a/src/bindings/java/JavaContext.cpp +++ b/src/bindings/java/JavaContext.cpp @@ -60,7 +60,6 @@ void JavaContextFactory::run_all() } } - JavaContext::JavaContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t process) @@ -69,8 +68,7 @@ JavaContext::JavaContext(std::function code, static int thread_amount=0; thread_amount++; - /* If the user provided a function for the process then use it - otherwise is the context for maestro */ + /* If the user provided a function for the process then use it otherwise is the context for maestro */ if (has_code()) { this->jprocess = nullptr; this->begin = xbt_os_sem_init(0); diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index 868c517197..56b47a420a 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -12,14 +12,11 @@ #include #include "jmsg_process.h" - #include "jmsg_as.h" - #include "jmsg_host.h" #include "jmsg_storage.h" #include "jmsg_task.h" #include "jxbt_utilities.h" - #include "jmsg.h" #include "JavaContext.hpp" @@ -75,13 +72,11 @@ void jmsg_throw_status(JNIEnv *env, msg_error_t status) { } } - /*************************************************************************************** * Unsortable functions * ***************************************************************************************/ -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls) +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls) { return (jdouble) MSG_get_clock(); } @@ -94,8 +89,7 @@ static void __JAVA_storage_priv_free(void *storage) { } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) { char **argv = NULL; int index; @@ -142,8 +136,7 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) free(argv); } -JNIEXPORT void JNICALL - JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) +JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) { /* Run everything */ XBT_DEBUG("Ready to run MSG_MAIN"); @@ -174,24 +167,18 @@ JNIEXPORT void JNICALL } } xbt_dynar_free(&storages); - } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, - jstring jplatformFile) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile) { - - const char *platformFile = - env->GetStringUTFChars(jplatformFile, 0); + const char *platformFile = env->GetStringUTFChars(jplatformFile, 0); MSG_create_environment(platformFile); env->ReleaseStringUTFChars(jplatformFile, platformFile); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls) +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls) { msg_as_t as = MSG_environment_get_routing_root(); jobject jas = jas_new_instance(env); @@ -209,43 +196,42 @@ Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls) return (jobject) jas; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_debug(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv * env, jclass cls, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_DEBUG("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_verb(JNIEnv * env, jclass cls, jstring js) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv * env, jclass cls, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_VERB("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv * env, jclass cls, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_INFO("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_warn(JNIEnv * env, jclass cls, jstring js) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv * env, jclass cls, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_WARN("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_error(JNIEnv * env, jclass cls, jstring js) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv * env, jclass cls, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_ERROR("%s", s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_critical(JNIEnv * env, jclass cls, jstring js) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv * env, jclass cls, jstring js) { const char *s = env->GetStringUTFChars(js, 0); XBT_CRITICAL("%s", s); @@ -255,12 +241,9 @@ Java_org_simgrid_msg_Msg_critical(JNIEnv * env, jclass cls, jstring js) static int java_main(int argc, char *argv[]); JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, - jstring jdeploymentFile) +Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jdeploymentFile) { - - const char *deploymentFile = - env->GetStringUTFChars(jdeploymentFile, 0); + const char *deploymentFile = env->GetStringUTFChars(jdeploymentFile, 0); SIMIX_function_register_default(java_main); MSG_launch_application(deploymentFile); @@ -292,8 +275,7 @@ static void run_jprocess(JNIEnv *env, jobject jprocess) static int java_main(int argc, char *argv[]) { JNIEnv *env = get_current_thread_env(); - simgrid::java::JavaContext* context = - (simgrid::java::JavaContext*) SIMIX_context_self(); + simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) SIMIX_context_self(); //Change the "." in class name for "/". xbt_str_subst(argv[0],'.','/',0); @@ -312,8 +294,7 @@ static int java_main(int argc, char *argv[]) env->NewStringUTF("")); int i; for (i = 1; i < argc; i++) - env->SetObjectArrayElement(args,i - 1, - env->NewStringUTF(argv[i])); + env->SetObjectArrayElement(args,i - 1, env->NewStringUTF(argv[i])); //Retrieve the host for the process. jstring jhostName = env->NewStringUTF(MSG_host_get_name(MSG_host_self())); jobject jhost = Java_org_simgrid_msg_Host_getByName(env, NULL, jhostName); @@ -341,14 +322,12 @@ namespace java { void java_main_jprocess(jobject jprocess) { JNIEnv *env = get_current_thread_env(); - simgrid::java::JavaContext* context = - (simgrid::java::JavaContext*) SIMIX_context_self(); + simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) SIMIX_context_self(); context->jprocess = jprocess; smx_process_t process = SIMIX_process_self(); jprocess_bind(context->jprocess, process, env); - // Adrien, ugly path, just to bypass creation of context at low levels - // (i.e such as for the VM migration for instance) + // Adrien, ugly path, just to bypass creation of context at low levels (i.e such as for the VM migration for instance) if (context->jprocess == nullptr) return; else @@ -358,8 +337,6 @@ void java_main_jprocess(jobject jprocess) } } - - #include "simgrid/plugins/energy.h" JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit(void) { diff --git a/src/bindings/java/jmsg.h b/src/bindings/java/jmsg.h index 06c8f2b5e5..8b9cea8df4 100644 --- a/src/bindings/java/jmsg.h +++ b/src/bindings/java/jmsg.h @@ -19,8 +19,7 @@ extern int JAVA_STORAGE_LEVEL; JavaVM *get_java_VM(void); JNIEnv *get_current_thread_env(void); /** - * This function throws the correct exception according to the status - * provided. + * This function throws the correct exception according to the status provided. */ void jmsg_throw_status(JNIEnv *env, msg_error_t status); @@ -30,46 +29,32 @@ void jmsg_throw_status(JNIEnv *env, msg_error_t status); * Signature ()D */ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Msg_getClock(JNIEnv *, jclass); + /** * Class org_simgrid_msg_Msg * Method run */ -JNIEXPORT void JNICALL - JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls); +JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass cls); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_energyInit(void); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_energyInit(void); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass, - jstring); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv *, jclass, jstring); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv *, jclass, - jstring); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_verb(JNIEnv *, jclass, jstring); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass, - jstring); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_info(JNIEnv *, jclass, jstring); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv *, jclass, - jstring); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_warn(JNIEnv *, jclass, jstring); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv *, jclass, - jstring); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_error(JNIEnv *, jclass, jstring); -JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv *, jclass, - jstring); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_critical(JNIEnv *, jclass, jstring); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, - jstring jplatformFile); -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, - jstring jdeploymentFile); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, jstring jdeploymentFile); SG_END_DECL() - #endif /* !MSG4JAVA_H */ diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp index e1d50eb384..b2fe858b0a 100644 --- a/src/bindings/java/jmsg_as.cpp +++ b/src/bindings/java/jmsg_as.cpp @@ -14,7 +14,6 @@ #include "jxbt_utilities.h" #include "jmsg.h" - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static jmethodID jas_method_As_constructor; @@ -41,8 +40,7 @@ msg_as_t jas_get_native(JNIEnv * env, jobject jas) { return (msg_as_t) (uintptr_t) env->GetLongField(jas, jas_field_As_bind); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) { jclass class_As = env->FindClass("org/simgrid/msg/As"); jas_method_As_constructor = env->GetMethodID(class_As, "", "()V"); jas_field_As_bind = jxbt_get_jfield(env,class_As, "bind", "J"); @@ -51,14 +49,12 @@ Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls) { } } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) { msg_as_t as = jas_get_native(env, jas); return env->NewStringUTF(MSG_environment_as_get_name(as)); } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas) { +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas) { int index = 0; jobjectArray jtable; jobject tmp_jas; @@ -98,13 +94,11 @@ Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas) { env->SetObjectArrayElement(jtable, index, tmp_jas); index++; - } return jtable; } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) { msg_as_t as = jas_get_native(env, jas); if (!as) { @@ -125,8 +119,7 @@ Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jas, jobject jname) { return jproperty; } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas) +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas) { int index; jobjectArray jtable; @@ -143,7 +136,7 @@ Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas) if (!cls) { return NULL; } - + jtable = env->NewObjectArray((jsize) count, cls, NULL); if (!jtable) { @@ -152,7 +145,6 @@ Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas) } for (index = 0; index < count; index++) { - host = xbt_dynar_get_as(table,index,msg_host_t); jhost = (jobject) host->extension(JAVA_HOST_LEVEL); diff --git a/src/bindings/java/jmsg_as.h b/src/bindings/java/jmsg_as.h index 0c1d34631f..68b62a7587 100644 --- a/src/bindings/java/jmsg_as.h +++ b/src/bindings/java/jmsg_as.h @@ -19,21 +19,15 @@ void jas_unref(JNIEnv * env, jobject jas); void jas_bind(jobject jas, msg_as_t as, JNIEnv * env); msg_as_t jas_get_native(JNIEnv * env, jobject jas); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv *env, jclass cls); -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas); -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas); +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas); -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jhost, jobject jname); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jhost, jobject jname); -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas); +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas); SG_END_DECL() - #endif /*!MSG_JAS_H */ diff --git a/src/bindings/java/jmsg_comm.cpp b/src/bindings/java/jmsg_comm.cpp index 95fa5a2e60..387768f416 100644 --- a/src/bindings/java/jmsg_comm.cpp +++ b/src/bindings/java/jmsg_comm.cpp @@ -41,11 +41,9 @@ void jcomm_bind_task(JNIEnv *env, jobject jcomm) { MSG_task_set_data(task, NULL); } - } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) { jclass jfield_class_Comm = env->FindClass("org/simgrid/msg/Comm"); if (!jfield_class_Comm) { jxbt_throw_native(env,bprintf("Can't find the org/simgrid/msg/Comm class.")); @@ -56,13 +54,13 @@ Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls) { jcomm_field_Comm_receiving = jxbt_get_jfield(env, jfield_class_Comm, "receiving", "Z"); jtask_field_Comm_task = jxbt_get_jfield(env, jfield_class_Comm, "task", "Lorg/simgrid/msg/Task;"); jcomm_field_Comm_finished = jxbt_get_jfield(env, jfield_class_Comm, "finished", "Z"); - if (!jcomm_field_Comm_bind || !jcomm_field_Comm_taskBind || !jcomm_field_Comm_receiving || !jtask_field_Comm_task || !jcomm_field_Comm_finished) { + if (!jcomm_field_Comm_bind || !jcomm_field_Comm_taskBind || !jcomm_field_Comm_receiving || !jtask_field_Comm_task || + !jcomm_field_Comm_finished) { jxbt_throw_native(env,bprintf("Can't find some fields in Java class.")); } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm) { msg_comm_t comm; msg_task_t *task_received; @@ -73,8 +71,7 @@ Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm) { MSG_comm_destroy(comm); } -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) { +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) { msg_comm_t comm; comm = (msg_comm_t) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_bind); @@ -100,8 +97,8 @@ Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) { } return JNI_FALSE; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout) { msg_comm_t comm = (msg_comm_t) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_bind); if (!comm) { jxbt_throw_native(env,bprintf("comm is null")); @@ -119,9 +116,7 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim if (status == MSG_OK) { jcomm_bind_task(env,jcomm); return; - } - else { + } else { jmsg_throw_status(env,status); } - } diff --git a/src/bindings/java/jmsg_comm.h b/src/bindings/java/jmsg_comm.h index 310c5bfa18..e5cd3dee35 100644 --- a/src/bindings/java/jmsg_comm.h +++ b/src/bindings/java/jmsg_comm.h @@ -13,24 +13,16 @@ SG_BEGIN_DECL() -/** - * This function binds the task associated with the communication to - * the java communication object. - */ +/** This function binds the task associated with the communication to the java communication object. */ void jcomm_bind_task(JNIEnv *env, jobject jcomm); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_nativeInit(JNIEnv *env, jclass cls); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_nativeFinalize(JNIEnv *env, jobject jcomm); -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm); +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout); SG_END_DECL() - #endif /* MSG_JCOMM_H */ diff --git a/src/bindings/java/jmsg_file.cpp b/src/bindings/java/jmsg_file.cpp index 6e7d204481..c716c996f1 100644 --- a/src/bindings/java/jmsg_file.cpp +++ b/src/bindings/java/jmsg_file.cpp @@ -14,19 +14,16 @@ void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t fd) { } msg_file_t jfile_get_native(JNIEnv *env, jobject jfile) { - msg_file_t file = - (msg_file_t)(intptr_t)env->GetLongField(jfile, jfile_field_bind); - return file; + return (msg_file_t)(intptr_t)env->GetLongField(jfile, jfile_field_bind); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_File_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_File_nativeInit(JNIEnv *env, jclass cls) { jclass class_File = env->FindClass("org/simgrid/msg/File"); jfile_field_bind = jxbt_get_jfield(env , class_File, "bind", "J"); xbt_assert((jfile_field_bind != NULL), "Can't find \"bind\" field in File class."); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile, jobject jpath) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile, jobject jpath) { const char *path = env->GetStringUTFChars((jstring) jpath, 0); msg_file_t file; @@ -35,22 +32,20 @@ Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile, jobject jpath) { env->ReleaseStringUTFChars((jstring) jpath, path); } -JNIEXPORT jlong JNICALL -Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize) { + +JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize) { msg_file_t file = jfile_get_native(env, jfile); return (jlong)MSG_file_read(file, (sg_size_t)jsize); } -JNIEXPORT jlong JNICALL -Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize) { +JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize) { msg_file_t file = jfile_get_native(env, jfile); return (jlong)MSG_file_write(file, (sg_size_t)jsize); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile) { msg_file_t file = jfile_get_native(env, jfile); MSG_file_close(file); jfile_bind(env, jfile, NULL); } - diff --git a/src/bindings/java/jmsg_file.h b/src/bindings/java/jmsg_file.h index 2d92f7a62d..88a451a140 100644 --- a/src/bindings/java/jmsg_file.h +++ b/src/bindings/java/jmsg_file.h @@ -22,34 +22,32 @@ msg_file_t jfile_get_native(JNIEnv *env, jobject jfile); * Method nativeInit * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_File_nativeInit(JNIEnv*, jclass); +JNIEXPORT void JNICALL Java_org_simgrid_msg_File_nativeInit(JNIEnv*, jclass); + /** * Class org_simgrid_msg_File * Method open * Signature (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_File_open(JNIEnv*, jobject, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_File_open(JNIEnv*, jobject, jobject); + /** * Class org_simgrid_msg_File * Method read */ -JNIEXPORT jlong JNICALL -Java_org_simgrid_msg_File_read(JNIEnv*, jobject, jlong); +JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv*, jobject, jlong); + /** * Class org_simgrid_msg_File * Method write */ -JNIEXPORT jlong JNICALL -Java_org_simgrid_msg_File_write(JNIEnv*, jobject, jlong); +JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv*, jobject, jlong); + /** * Class org_simgrid_msg_File * Method close */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_File_close(JNIEnv*, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv*, jobject); SG_END_DECL() - #endif diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index 98e5094a97..aa84bd2837 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -54,8 +54,7 @@ jboolean jhost_is_valid(jobject jhost, JNIEnv * env) { } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) { jclass class_Host = env->FindClass("org/simgrid/msg/Host"); jhost_method_Host_constructor = env->GetMethodID(class_Host, "", "()V"); jhost_field_Host_bind = jxbt_get_jfield(env,class_Host, "bind", "J"); @@ -64,9 +63,8 @@ Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls) { jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug.")); } } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls, - jstring jname) { + +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls, jstring jname) { msg_host_t host; /* native host */ jobject jhost; /* global reference to the java host instance returned */ @@ -87,7 +85,6 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls, env->ReleaseStringUTFChars(jname, name); if (!host->extension(JAVA_HOST_LEVEL)) { /* native host not associated yet with java host */ - /* Instantiate a new java host */ jhost = jhost_new_instance(env); @@ -108,9 +105,7 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls, /* bind the java host and the native host */ jhost_bind(jhost, host, env); - /* the native host data field is set with the global reference to the - * java host returned by this function - */ + /* the native host data field is set with the global reference to the java host returned by this function */ host->extension_set(JAVA_HOST_LEVEL, (void *)jhost); } @@ -118,8 +113,7 @@ Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jclass cls, return (jobject) host->extension(JAVA_HOST_LEVEL); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) { jobject jhost; msg_host_t host = MSG_host_self(); @@ -156,29 +150,24 @@ Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jclass cls) { return jhost; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); MSG_host_on(host); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); MSG_host_off(host); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount(JNIEnv * env, jclass cls) { xbt_dynar_t hosts = MSG_hosts_as_dynar(); int nb_host = xbt_dynar_length(hosts); xbt_dynar_free(&hosts); return (jint) nb_host; } -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env, - jobject jhost) { +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); if (!host) { @@ -189,9 +178,7 @@ Java_org_simgrid_msg_Host_getSpeed(JNIEnv * env, return (jdouble) MSG_host_get_speed(host); } -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env, - jobject jhost) { +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env, jobject jhost) { msg_host_t host = jhost_get_native(env, jhost); if (!host) { @@ -202,8 +189,7 @@ Java_org_simgrid_msg_Host_getCoreNumber(JNIEnv * env, return (jdouble) MSG_host_get_core_number(host); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname) { msg_host_t host = jhost_get_native(env, jhost); if (!host) { @@ -240,10 +226,10 @@ Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, env->ReleaseStringUTFChars((jstring) jvalue, value_java); env->ReleaseStringUTFChars((jstring) jname, name); - } -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject jhost) { + +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject jhost) +{ msg_host_t host = jhost_get_native(env, jhost); if (!host) { @@ -254,9 +240,8 @@ Java_org_simgrid_msg_Host_isOn(JNIEnv * env, jobject jhost) { return (jboolean) MSG_host_is_on(host); } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost){ - +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost) +{ msg_host_t host = jhost_get_native(env, jhost); jobject jstorage; jstring jname; @@ -292,8 +277,8 @@ Java_org_simgrid_msg_Host_getMountedStorage(JNIEnv * env, jobject jhost){ return jtable; } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost){ +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost) +{ msg_host_t host = jhost_get_native(env, jhost); if (!host) { @@ -318,8 +303,8 @@ Java_org_simgrid_msg_Host_getAttachedStorage(JNIEnv * env, jobject jhost){ return jtable; } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost){ +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost) +{ msg_host_t host = jhost_get_native(env, jhost); if (!host) { @@ -329,9 +314,7 @@ Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost){ return (jobjectArray)MSG_host_get_storage_content(host); } - -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg) +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg) { int index; jobjectArray jtable; @@ -362,8 +345,7 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg) if (!jhost) { jname = env->NewStringUTF(MSG_host_get_name(host)); - jhost = - Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); + jhost = Java_org_simgrid_msg_Host_getByName(env, cls_arg, jname); /* FIXME: leak of jname ? */ } @@ -373,17 +355,16 @@ Java_org_simgrid_msg_Host_all(JNIEnv * env, jclass cls_arg) return jtable; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname){ - +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname) +{ const char *name = env->GetStringUTFChars((jstring) jname, 0); MSG_mailbox_set_async(name); env->ReleaseStringUTFChars((jstring) jname, name); - } #include "simgrid/plugins/energy.h" -JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *env, jobject jhost) { +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *env, jobject jhost) +{ msg_host_t host = jhost_get_native(env, jhost); if (!host) { @@ -392,6 +373,4 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *e } return MSG_host_get_consumed_energy(host); - } - diff --git a/src/bindings/java/jmsg_host.h b/src/bindings/java/jmsg_host.h index 327940c7b9..1e76b67c5d 100644 --- a/src/bindings/java/jmsg_host.h +++ b/src/bindings/java/jmsg_host.h @@ -17,71 +17,63 @@ SG_BEGIN_DECL() /** * This function returns a new java host instance. * - * @param env The environment of the current thread + * @param env The environment of the current thread * * @return A new java host object. * - * @exception If the class Host is not found the function throws - * the ClassNotFoundException. If the constructor of - * this class is not found the function throws the exception - * NotSuchMethodException. + * @exception If the class Host is not found the function throws the ClassNotFoundException. If the constructor of + * this class is not found the function throws the exception NotSuchMethodException. */ jobject jhost_new_instance(JNIEnv * env); /** - * This function returns a global reference to the java host instance - * specified by the parameter jhost. + * This function returns a global reference to the java host instance specified by the parameter jhost. * - * @param jhost The original java host instance. - * @param env The environment of the current thread + * @param jhost The original java host instance. + * @param env The environment of the current thread * - * @return The global reference to the original java host - * instance. + * @return The global reference to the original java host instance. */ jobject jhost_ref(JNIEnv * env, jobject jhost); + /** * This function delete a global reference to a java host instance. * * @param The global refernce to delete. - * @param env The environment of the current thread + * @param env The environment of the current thread */ void jhost_unref(JNIEnv * env, jobject jhost); /** * This function associated a native host to a java host instance. * - * @param jhost The java host instance. - * @param host The native host to bind. + * @param jhost The java host instance. + * @param host The native host to bind. * @param env The environment of the current thread * - * @exception If the class Host is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Host is not found the function throws the ClassNotFoundException. If the field bind of + * this class is not found the function throws the exception NotSuchFieldException. */ void jhost_bind(jobject jhost, msg_host_t host, JNIEnv * env); /** * This function returns a native host from a java host instance. * - * @param jhost The java host object from which get the native host. - * @param env The environment of the current thread + * @param jhost The java host object from which get the native host. + * @param env The environment of the current thread * - * @return The function returns the native host associated to the - * java host object. + * @return The function returns the native host associated to the java host object. * - * @exception If the class Host is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Host is not found the function throws the ClassNotFoundException. If the field bind of + * this class is not found the function throws the exception NotSuchFieldException. */ msg_host_t jhost_get_native(JNIEnv * env, jobject jhost); /** * This function returns the name of a MSG host. * - * @param jhost A java host object. - * @param env The environment of the current thread + * @param jhost A java host object. + * @param env The environment of the current thread * * @return The name of the host. */ @@ -91,44 +83,40 @@ const char *jhost_get_name(jobject jhost, JNIEnv * env); * This function tests if a java host instance is valid. * A java host object is valid if it is bind to a native host. * - * @param jhost The host to test the validity. + * @param jhost The host to test the validity. * @param env The environment of the current thread * - * @return If the java host is valid the function returns true. - * Otherwise the function returns false. + * @return If the java host is valid the function returns true. Otherwise the function returns false. */ jboolean jhost_is_valid(jobject jhost, JNIEnv * env); + /* * Class org_simgrid_msg_Host * Method nativeInit * Signature (); */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_nativeInit(JNIEnv *env, jclass cls); /* * Class org_simgrid_msg_Host * Method getByName * Signature (Ljava/lang/String;)Lsimgrid/msg/Host; */ -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName - (JNIEnv *, jclass, jstring); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName (JNIEnv *, jclass, jstring); /** * This function start the host if it is off * - * @param jhost The host to test the validity. + * @param jhost The host to test the validity. * @param env The environment of the current thread - * */ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_on(JNIEnv *env, jobject jhost); /** * This function stop the host if it is on * - * @param jhost The host to test the validity. + * @param jhost The host to test the validity. * @param env The environment of the current thread - * */ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost); @@ -137,52 +125,49 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_off(JNIEnv *env, jobject jhost) * Method currentHost * Signature ()Lsimgrid/msg/Host; */ -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost - (JNIEnv *, jclass); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost (JNIEnv *, jclass); + /* * Class org_simgrid_msg_Host * Method getCount * Signature ()I */ -JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount - (JNIEnv *, jclass); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Host_getCount (JNIEnv *, jclass); /* * Class org_simgrid_msg_Host * Method getSpeed * Signature ()D */ -JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed - (JNIEnv *, jobject); +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getSpeed (JNIEnv *, jobject); + /* * Class org_simgrid_msg_Host * Method getCoreNumber * Signature ()D */ -JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber - (JNIEnv *, jobject); +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getCoreNumber (JNIEnv *, jobject); + /* * Class org_simgrid_msg_Host * Method getProperty * Signature (Ljava/lang/String;)Ljava/lang/String; */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getProperty(JNIEnv *env, jobject jhost, jobject jname); + /* * Class org_simgrid_msg_Host * Method setProperty * Signature (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, jobject jvalue); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, jobject jvalue); + /* * Class org_simgrid_msg_Host * Method isOn * Signature ()Z */ -JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn - (JNIEnv *, jobject); - +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Host_isOn (JNIEnv *, jobject); /* * Class org_simgrid_msg_Host @@ -203,21 +188,16 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getAttachedStorage(JNIE */ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_getStorageContent(JNIEnv * env, jobject jhost); - /** * Class org_simgrid_msg_Host * Method all */ -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_Host_all(JNIEnv *, jclass); - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname); +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv *, jclass); -JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy - (JNIEnv *, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Host_setAsyncMailbox(JNIEnv * env, jclass cls_arg, jobject jname); +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Host_getConsumedEnergy (JNIEnv *, jobject); +SG_END_DECL() #endif /*!MSG_JHOST_H */ -SG_END_DECL() diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 05491e3a5e..b43ff09f54 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -32,8 +32,7 @@ Java_org_simgrid_msg_Process_exit(JNIEnv *env, jobject jprocess) { jobject native_to_java_process(msg_process_t process) { - simgrid::java::JavaContext* context = - (simgrid::java::JavaContext*) MSG_process_get_smx_ctx(process); + simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) MSG_process_get_smx_ctx(process); return context->jprocess; } @@ -50,28 +49,23 @@ void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env) void jprocess_join(jobject jprocess, JNIEnv * env) { msg_process_t process = jprocess_to_native_process(jprocess,env); - simgrid::java::JavaContext* context = - (simgrid::java::JavaContext*) MSG_process_get_smx_ctx(process); + simgrid::java::JavaContext* context = (simgrid::java::JavaContext*) MSG_process_get_smx_ctx(process); xbt_os_thread_join(context->thread,NULL); } msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env) { - return - (msg_process_t)(intptr_t)env->GetLongField(jprocess, - jprocess_field_Process_bind); + return (msg_process_t)(intptr_t)env->GetLongField(jprocess, jprocess_field_Process_bind); } void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env) { - env->SetLongField(jprocess, jprocess_field_Process_bind, - (intptr_t)process); + env->SetLongField(jprocess, jprocess_field_Process_bind, (intptr_t)process); } jlong jprocess_get_id(jobject jprocess, JNIEnv * env) { - return - (intptr_t)env->GetLongField(jprocess, jprocess_field_Process_id); + return (intptr_t)env->GetLongField(jprocess, jprocess_field_Process_id); } jstring jprocess_get_name(jobject jprocess, JNIEnv * env) @@ -89,8 +83,8 @@ jboolean jprocess_is_valid(jobject jprocess, JNIEnv * env) return env->GetLongField(jprocess, id) ? JNI_TRUE : JNI_FALSE; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) { jclass jprocess_class_Process = env->FindClass("org/simgrid/msg/Process"); jprocess_field_Process_name = jxbt_get_jfield(env, jprocess_class_Process, "name", "Ljava/lang/String;"); @@ -100,19 +94,14 @@ Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls) { jprocess_field_Process_ppid = jxbt_get_jfield(env, jprocess_class_Process, "ppid", "I"); jprocess_field_Process_host = jxbt_get_jfield(env, jprocess_class_Process, "host", "Lorg/simgrid/msg/Host;"); jprocess_field_Process_killTime = jxbt_get_jfield(env, jprocess_class_Process, "killTime", "D"); - if (!jprocess_class_Process || !jprocess_field_Process_id || !jprocess_field_Process_name || !jprocess_field_Process_pid || - !jprocess_field_Process_ppid || !jprocess_field_Process_host) { + if (!jprocess_class_Process || !jprocess_field_Process_id || !jprocess_field_Process_name || + !jprocess_field_Process_pid || !jprocess_field_Process_ppid || !jprocess_field_Process_host) { jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug.")); } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_create(JNIEnv * env, - jobject jprocess_arg, - jobject jhostname) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv * env, jobject jprocess_arg, jobject jhostname) { - - jobject jprocess; /* the global reference to the java process instance */ jstring jname; /* the name of the java process instance */ const char *name; /* the C name of the process */ @@ -152,8 +141,7 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env, /* Retrieve the kill time from the process */ jdouble jkill = env->GetDoubleField(jprocess, jprocess_field_Process_killTime); /* Actually build the MSG process */ - process = MSG_process_create_with_environment(name, - [](int argc, char** argv) -> int { + process = MSG_process_create_with_environment(name, [](int argc, char** argv) -> int { smx_process_t process = SIMIX_process_self(); // This is the jprocess passed as environment. // It would be simplet if we could use a closure. @@ -182,16 +170,12 @@ Java_org_simgrid_msg_Process_create(JNIEnv * env, env->SetObjectField(jprocess, jprocess_field_Process_host, jhost); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Process_killAll(JNIEnv * env, jclass cls, - jint jresetPID) +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll(JNIEnv * env, jclass cls, jint jresetPID) { return (jint) MSG_process_killall((int) jresetPID); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, - jint PID) +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, jint PID) { msg_process_t process = MSG_process_from_PID(PID); @@ -209,8 +193,8 @@ Java_org_simgrid_msg_Process_fromPID(JNIEnv * env, jclass cls, return jprocess; } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) { + +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname) { msg_process_t process = jprocess_to_native_process(jprocess, env); if (!process) { @@ -230,8 +214,8 @@ Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject return jproperty; } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Process_getCurrentProcess(JNIEnv * env, jclass cls) + +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getCurrentProcess(JNIEnv * env, jclass cls) { msg_process_t process = MSG_process_self(); jobject jprocess; @@ -249,9 +233,7 @@ Java_org_simgrid_msg_Process_getCurrentProcess(JNIEnv * env, jclass cls) return jprocess; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_suspend(JNIEnv * env, - jobject jprocess) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobject jprocess) { msg_process_t process = jprocess_to_native_process(jprocess, env); @@ -263,14 +245,10 @@ Java_org_simgrid_msg_Process_suspend(JNIEnv * env, /* try to suspend the process */ msg_error_t rv = MSG_process_suspend(process); - jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, - bprintf("unexpected error , please report this bug")); - + jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_resume(JNIEnv * env, - jobject jprocess) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume(JNIEnv * env, jobject jprocess) { msg_process_t process = jprocess_to_native_process(jprocess, env); @@ -282,12 +260,10 @@ Java_org_simgrid_msg_Process_resume(JNIEnv * env, /* try to resume the process */ msg_error_t rv = MSG_process_resume(process); - jxbt_check_res("MSG_process_resume()", rv, MSG_OK, - bprintf("unexpected error , please report this bug")); + jxbt_check_res("MSG_process_resume()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_setAutoRestart - (JNIEnv *env, jobject jprocess, jboolean jauto_restart) { +JNIEXPORT void +JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jprocess, jboolean jauto_restart) { msg_process_t process = jprocess_to_native_process(jprocess, env); xbt_ex_t e; @@ -305,9 +281,8 @@ Java_org_simgrid_msg_Process_setAutoRestart xbt_ex_free(e); } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_restart - (JNIEnv *env, jobject jprocess) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobject jprocess) { msg_process_t process = jprocess_to_native_process(jprocess, env); xbt_ex_t e; @@ -324,9 +299,7 @@ Java_org_simgrid_msg_Process_restart } } -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, - jobject jprocess) +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, jobject jprocess) { msg_process_t process = jprocess_to_native_process(jprocess, env); @@ -339,8 +312,7 @@ Java_org_simgrid_msg_Process_isSuspended(JNIEnv * env, return (jboolean) MSG_process_is_suspended(process); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) { double time = ((double)jmillis) / 1000 + ((double)jnanos) / 1000000000; msg_error_t rv; @@ -358,9 +330,8 @@ Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jxbt_throw_host_failure(env,NULL); } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, - jdouble jseconds) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, jdouble jseconds) { msg_error_t rv; rv = MSG_process_sleep((double)jseconds); @@ -372,9 +343,7 @@ Java_org_simgrid_msg_Process_waitFor(JNIEnv * env, jobject jprocess, } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_kill(JNIEnv * env, - jobject jprocess) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill(JNIEnv * env, jobject jprocess) { /* get the native instances from the java ones */ msg_process_t process = jprocess_to_native_process(jprocess, env); @@ -385,9 +354,8 @@ Java_org_simgrid_msg_Process_kill(JNIEnv * env, MSG_process_kill(process); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_migrate(JNIEnv * env, - jobject jprocess, jobject jhost) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate(JNIEnv * env, jobject jprocess, jobject jhost) { msg_process_t process = jprocess_to_native_process(jprocess, env); @@ -412,14 +380,13 @@ Java_org_simgrid_msg_Process_migrate(JNIEnv * env, /* change the host java side */ env->SetObjectField(jprocess, jprocess_field_Process_host, jhost); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdouble jkilltime) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime (JNIEnv *env , jobject jprocess, jdouble jkilltime) { msg_process_t process = jprocess_to_native_process(jprocess, env); MSG_process_set_kill_time(process, (double)jkilltime); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls) { return (jint) MSG_process_get_number(); } diff --git a/src/bindings/java/jmsg_process.h b/src/bindings/java/jmsg_process.h index 145f830ef0..647d41fc44 100644 --- a/src/bindings/java/jmsg_process.h +++ b/src/bindings/java/jmsg_process.h @@ -24,21 +24,17 @@ extern jfieldID jprocess_field_Process_name; extern jfieldID jprocess_field_Process_pid; extern jfieldID jprocess_field_Process_ppid; -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_exit(JNIEnv *env, jobject); - +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_exit(JNIEnv *env, jobject); jobject native_to_java_process(msg_process_t process); /** - * This function returns a global reference to the java process instance - * specified by the parameter jprocess. + * This function returns a global reference to the java process instance specified by the parameter jprocess. * - * @param jprocess The original java process instance. - * @param env The env of the current thread + * @param jprocess The original java process instance. + * @param env The env of the current thread * - * @return The global reference to the original java process - * instance. + * @return The global reference to the original java process instance. */ jobject jprocess_new_global_ref(jobject jprocess, JNIEnv * env); @@ -47,67 +43,57 @@ jobject jprocess_new_global_ref(jobject jprocess, JNIEnv * env); * If the java process is alive the function joins it and stops it before. * * @param The global refernce to delete. - * @param env The env of the current thread + * @param env The env of the current thread * * @see jprocess_join() * @see jprocess_exit() */ void jprocess_delete_global_ref(jobject jprocess, JNIEnv * env); - /** * This function waits for a java process to terminate. * - * @param jprocess The java process ot wait for. - * @param env The env of the current thread - * - * @exception If the class Process is not found the function throws - * the ClassNotFoundException. If the methos join() of - * this class is not found the function throws the exception - * NotSuchMethodException. + * @param jprocess The java process ot wait for. + * @param env The env of the current thread * + * @exception If the class Process is not found the function throws the ClassNotFoundException. If the method + join() of this class is not found the function throws the exception NotSuchMethodException. */ void jprocess_join(jobject jprocess, JNIEnv * env); + /** * This function associated a native process to a java process instance. * - * @param jprocess The java process instance. + * @param jprocess The java process instance. * @param process The native process to bind. - * @param env The env of the current thread + * @param env The env of the current thread * - * @exception If the class Process is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Process is not found the function throws the ClassNotFoundException. If the field + * bind of this class is not found the function throws the exception NotSuchFieldException. */ void jprocess_bind(jobject jprocess, msg_process_t process, JNIEnv * env); /** * This function returns a native process from a java process instance. * - * @param jprocess The java process object from which get the native process. - * @param env The env of the current thread + * @param jprocess The java process object from which get the native process. + * @param env The env of the current thread * - * @return The function returns the native process associated to the - * java process object. + * @return The function returns the native process associated to the java process object. * - * @exception If the class Process is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Process is not found the function throws the ClassNotFoundException. If the field + * bind of this class is not found the function throws the exception NotSuchFieldException. */ msg_process_t jprocess_to_native_process(jobject jprocess, JNIEnv * env); /** * This function gets the id of the specified java process. * - * @param jprocess The java process to get the id. - * @param env The env of the current thread + * @param jprocess The java process to get the id. + * @param env The env of the current thread * - * @exception If the class Process is not found the function throws - * the ClassNotFoundException. If the field id of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Process is not found the function throws the ClassNotFoundException. If the field id + * of this class is not found the function throws the exception NotSuchFieldException. * * @return The id of the specified java process. */ @@ -115,27 +101,23 @@ jlong jprocess_get_id(jobject jprocess, JNIEnv * env); /** * This function tests if a java process instance is valid. - * A java process object is valid if it is bind to a native - * process. + * A java process object is valid if it is bind to a native process. * - * @param jprocess The java process to test the validity. - * @param env The env of the current thread + * @param jprocess The java process to test the validity. + * @param env The env of the current thread * - * @return If the java process is valid the function returns true. - * Otherwise the function returns false. + * @return If the java process is valid the function returns true. Otherwise the function returns false. */ jboolean jprocess_is_valid(jobject jprocess, JNIEnv * env); /** * This function gets the name of the specified java process. * - * @param jprocess The java process to get the name. - * @param env The env of the current thread + * @param jprocess The java process to get the name. + * @param env The env of the current thread * - * @exception If the class Process is not found the function throws - * the ClassNotFoundException. If the field name of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Process is not found the function throws the ClassNotFoundException. If the field name + * of this class is not found the function throws the exception NotSuchFieldException. * * @return The name of the specified java process. */ @@ -146,126 +128,114 @@ jstring jprocess_get_name(jobject jprocess, JNIEnv * env); * Method nativeInit * Signature (); */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_nativeInit(JNIEnv *env, jclass cls); /* * Class org_simgrid_msg_Process * Method create * Signature (Lorg/simgrid/msg/Host;)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_create(JNIEnv * env, - jobject jprocess_arg, - jobject jhostname); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_create(JNIEnv * env, jobject jprocess_arg, jobject jhostname); /* * Class org_simgrid_msg_Process * Method killAll * Signature (I)I */ -JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll - (JNIEnv *, jclass, jint); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_killAll (JNIEnv *, jclass, jint); /* * Class org_simgrid_msg_Process * Method fromPID * Signature (I)Lorg/simgrid/msg/Process; */ -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID - (JNIEnv *, jclass, jint); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_fromPID (JNIEnv *, jclass, jint); + /* * Class org_simgrid_msg_Process * Method getProperty * Signature (D)V */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getProperty(JNIEnv *env, jobject jprocess, jobject jname); + /* * Class org_simgrid_msg_Process * Method currentProcess * Signature ()Lorg/simgrid/msg/Process; */ -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getCurrentProcess - (JNIEnv *, jclass); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Process_getCurrentProcess (JNIEnv *, jclass); + /* * Class org_simgrid_msg_Process * Method suspend * Signature (Lorg/simgrid/msg/Process;)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Process_suspend(JNIEnv * env, - jobject jprocess); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_suspend(JNIEnv * env, jobject jprocess); + /* * Class org_simgrid_msg_Process * Method resume * Signature (Lorg/simgrid/msg/Process;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume - (JNIEnv *, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_resume (JNIEnv *, jobject); + /* * Class org_simgrid_msg_Process * Method setAutoRestart * Signature (Lorg/simgrid/msg/Process;Z)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setAutoRestart - (JNIEnv *, jobject, jboolean); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *, jobject, jboolean); + /* * Class org_simgrid_msg_Process * Method restart * Signature (Lorg/simgrid/msg/Process;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart - (JNIEnv *, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *, jobject); /* * Class org_simgrid_msg_Process * Method isSuspended * Signature (Lorg/simgrid/msg/Process;)Z */ -JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended - (JNIEnv *, jobject); +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Process_isSuspended (JNIEnv *, jobject); + /* * Class org_simgrid_msg_Process * Method sleep * Signature (DI)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep - (JNIEnv *, jclass, jlong, jint); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep (JNIEnv *, jclass, jlong, jint); /* * Class org_simgrid_msg_Process * Method waitFor * Signature (D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor - (JNIEnv *, jobject, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_waitFor (JNIEnv *, jobject, jdouble); + /* * Class org_simgrid_msg_Process * Method kill * Signature (Lorg/simgrid/msg/Process;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill - (JNIEnv *, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_kill (JNIEnv *, jobject); /* * Class org_simgrid_msg_Process * Method migrate * Signature (Lorg/simgrid/msg/Host;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate - (JNIEnv *, jobject, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_migrate (JNIEnv *, jobject, jobject); + /* * Class org_simgrid_msg_Process * Method setKillTime * Signature (D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime - (JNIEnv *, jobject, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_setKillTime (JNIEnv *, jobject, jdouble); -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Process_getCount(JNIEnv * env, jclass cls); SG_END_DECL(); - #endif /* !MSG_JPROCESS_H */ diff --git a/src/bindings/java/jmsg_rngstream.cpp b/src/bindings/java/jmsg_rngstream.cpp index ea37f5c03f..b14662d6c1 100644 --- a/src/bindings/java/jmsg_rngstream.cpp +++ b/src/bindings/java/jmsg_rngstream.cpp @@ -12,8 +12,7 @@ jfieldID jrngstream_bind; RngStream jrngstream_to_native(JNIEnv *env, jobject jrngstream) { - RngStream rngstream = - (RngStream)(intptr_t)env->GetLongField(jrngstream, jrngstream_bind); + RngStream rngstream = (RngStream)(intptr_t)env->GetLongField(jrngstream, jrngstream_bind); if (!rngstream) { jxbt_throw_notbound(env, "rngstream", jrngstream); return NULL; @@ -21,15 +20,13 @@ RngStream jrngstream_to_native(JNIEnv *env, jobject jrngstream) { return rngstream; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_nativeInit(JNIEnv *env, jclass cls) { jclass class_RngStream = env->FindClass("org/simgrid/msg/RngStream"); jrngstream_bind = jxbt_get_jfield(env, class_RngStream, "bind", "J"); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_create(JNIEnv *env, jobject jrngstream, jstring jname) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_create(JNIEnv *env, jobject jrngstream, jstring jname) { const char *name = env->GetStringUTFChars(jname, 0); RngStream rngstream = RngStream_CreateStream(name); //Bind the RngStream object @@ -37,12 +34,13 @@ Java_org_simgrid_msg_RngStream_create(JNIEnv *env, jobject jrngstream, jstring j env->ReleaseStringUTFChars(jname, name); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_nativeFinalize(JNIEnv *env, jobject jrngstream) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_nativeFinalize(JNIEnv *env, jobject jrngstream) { RngStream rngstream = jrngstream_to_native(env, jrngstream); RngStream_DeleteStream(&rngstream); env->SetLongField(jrngstream, jrngstream_bind, (intptr_t)NULL); } + JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_RngStream_setPackageSeed(JNIEnv *env, jobject jrngstream, jintArray jseed) { jint buffer[6]; @@ -57,32 +55,32 @@ Java_org_simgrid_msg_RngStream_setPackageSeed(JNIEnv *env, jobject jrngstream, j return result == -1 ? JNI_FALSE : JNI_TRUE; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_resetStart(JNIEnv *env, jobject jrngstream) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_resetStart(JNIEnv *env, jobject jrngstream) { RngStream rngstream = jrngstream_to_native(env, jrngstream); if (!rngstream) return; RngStream_ResetStartStream(rngstream); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_resetStartSubstream(JNIEnv *env, jobject jrngstream) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_resetStartSubstream(JNIEnv *env, jobject jrngstream) { RngStream rngstream = jrngstream_to_native(env, jrngstream); if (!rngstream) return; RngStream_ResetStartSubstream(rngstream); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_resetNextSubstream(JNIEnv *env, jobject jrngstream) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_resetNextSubstream(JNIEnv *env, jobject jrngstream) { RngStream rngstream = jrngstream_to_native(env, jrngstream); if (!rngstream) return; RngStream_ResetNextSubstream(rngstream); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_setAntithetic(JNIEnv *env, jobject jrngstream, jboolean ja) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_setAntithetic(JNIEnv *env, jobject jrngstream, jboolean ja) { RngStream rngstream = jrngstream_to_native(env, jrngstream); if (!rngstream) return; @@ -94,8 +92,8 @@ Java_org_simgrid_msg_RngStream_setAntithetic(JNIEnv *env, jobject jrngstream, jb RngStream_SetAntithetic(rngstream,0); } } -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_RngStream_setSeed(JNIEnv *env, jobject jrngstream, jintArray jseed) { + +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_RngStream_setSeed(JNIEnv *env, jobject jrngstream, jintArray jseed) { jint buffer[6]; env->GetIntArrayRegion(jseed, 0, 6, buffer); @@ -104,29 +102,28 @@ Java_org_simgrid_msg_RngStream_setSeed(JNIEnv *env, jobject jrngstream, jintArra if (!rngstream) return JNI_FALSE; - int result = RngStream_SetSeed(rngstream, (unsigned long*)buffer); return result == -1 ? JNI_FALSE : JNI_TRUE; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_advanceState(JNIEnv *env, jobject jrngstream, jint e, jint g) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_advanceState(JNIEnv *env, jobject jrngstream, jint e, jint g) { RngStream rngstream = jrngstream_to_native(env, jrngstream); if (!rngstream) return; RngStream_AdvanceState(rngstream, (long)e, (long)g); } -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_RngStream_randU01(JNIEnv *env, jobject jrngstream) { + +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_RngStream_randU01(JNIEnv *env, jobject jrngstream) { RngStream rngstream = jrngstream_to_native(env, jrngstream); if (!rngstream) return 0; return (jdouble)RngStream_RandU01(rngstream); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_RngStream_randInt(JNIEnv *env, jobject jrngstream, jint i, jint j) { + +JNIEXPORT jint JNICALL Java_org_simgrid_msg_RngStream_randInt(JNIEnv *env, jobject jrngstream, jint i, jint j) { RngStream rngstream = jrngstream_to_native(env, jrngstream); if (!rngstream) return 0; diff --git a/src/bindings/java/jmsg_rngstream.h b/src/bindings/java/jmsg_rngstream.h index f3827c9cd0..b7c28c4a39 100644 --- a/src/bindings/java/jmsg_rngstream.h +++ b/src/bindings/java/jmsg_rngstream.h @@ -15,42 +15,30 @@ SG_BEGIN_DECL() RngStream jrngstream_to_native(JNIEnv *env, jobject jrngstream); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_nativeInit(JNIEnv *env, jclass cls); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_create(JNIEnv *env, jobject jrngstream, jstring name); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_create(JNIEnv *env, jobject jrngstream, jstring name); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_nativeFinalize(JNIEnv *env, jobject jrngstream); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_nativeFinalize(JNIEnv *env, jobject jrngstream); JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_RngStream_setPackageSeed(JNIEnv *env, jobject jrngstream, jintArray seed); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_resetStart(JNIEnv *env, jobject jrngstream); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_resetStart(JNIEnv *env, jobject jrngstream); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_resetStartSubstream(JNIEnv *env, jobject jrngstream); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_resetStartSubstream(JNIEnv *env, jobject jrngstream); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_resetNextSubstream(JNIEnv *env, jobject jrngstream); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_resetNextSubstream(JNIEnv *env, jobject jrngstream); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_setAntithetic(JNIEnv *env, jobject jrngstream, jboolean ja); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_setAntithetic(JNIEnv *env, jobject jrngstream, jboolean ja); -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_RngStream_setSeed(JNIEnv *env, jobject jrngstream, jintArray jseed); +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_RngStream_setSeed(JNIEnv *env, jobject jrngstream, jintArray jseed); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_RngStream_advanceState(JNIEnv *env, jobject jrngstream, jint e, jint g); +JNIEXPORT void JNICALL Java_org_simgrid_msg_RngStream_advanceState(JNIEnv *env, jobject jrngstream, jint e, jint g); -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_RngStream_randU01(JNIEnv *env, jobject jrngstream); +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_RngStream_randU01(JNIEnv *env, jobject jrngstream); -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_RngStream_randInt(JNIEnv *env, jobject jrngstream, jint i, jint j); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_RngStream_randInt(JNIEnv *env, jobject jrngstream, jint i, jint j); SG_END_DECL() - #endif /* MSG_RNGSTREAM_H */ diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp index 1af9c1eff7..8caed69e10 100644 --- a/src/bindings/java/jmsg_storage.cpp +++ b/src/bindings/java/jmsg_storage.cpp @@ -29,8 +29,7 @@ msg_storage_t jstorage_get_native(JNIEnv * env, jobject jstorage) { return (msg_storage_t) (uintptr_t) env->GetLongField(jstorage, jstorage_field_Storage_bind); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Storage_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_nativeInit(JNIEnv *env, jclass cls) { jclass class_Storage = env->FindClass("org/simgrid/msg/Storage"); jstorage_method_Storage_constructor = env->GetMethodID(class_Storage, "", "()V"); jstorage_field_Storage_bind = jxbt_get_jfield(env,class_Storage, "bind", "J"); @@ -57,9 +56,7 @@ const char *jstorage_get_name(jobject jstorage, JNIEnv * env) { return MSG_storage_get_name(storage); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, jclass cls, - jstring jname) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, jclass cls, jstring jname) { msg_storage_t storage; jobject jstorage; @@ -110,9 +107,7 @@ Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, jclass cls, return (jobject) xbt_lib_get_level(storage, JAVA_STORAGE_LEVEL); } - -JNIEXPORT jlong JNICALL -Java_org_simgrid_msg_Storage_getSize(JNIEnv * env,jobject jstorage) { +JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getSize(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); if (!storage) { @@ -123,8 +118,7 @@ Java_org_simgrid_msg_Storage_getSize(JNIEnv * env,jobject jstorage) { return (jlong) MSG_storage_get_size(storage); } -JNIEXPORT jlong JNICALL -Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv * env,jobject jstorage) { +JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); if (!storage) { @@ -135,8 +129,7 @@ Java_org_simgrid_msg_Storage_getFreeSize(JNIEnv * env,jobject jstorage) { return (jlong) MSG_storage_get_free_size(storage); } -JNIEXPORT jlong JNICALL -Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv * env,jobject jstorage) { +JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); if (!storage) { @@ -147,8 +140,7 @@ Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv * env,jobject jstorage) { return (jlong) MSG_storage_get_used_size(storage); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Storage_getProperty(JNIEnv *env, jobject jstorage, jobject jname) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getProperty(JNIEnv *env, jobject jstorage, jobject jname) { msg_storage_t storage = jstorage_get_native(env, jstorage); if (!storage) { @@ -187,8 +179,7 @@ Java_org_simgrid_msg_Storage_setProperty(JNIEnv *env, jobject jstorage, jobject } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage) { msg_storage_t storage = jstorage_get_native(env, jstorage); if (!storage) { @@ -204,8 +195,7 @@ Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage) { return jhost_name; } -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_Storage_all(JNIEnv * env, jclass cls_arg) +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv * env, jclass cls_arg) { int index; jobjectArray jtable; diff --git a/src/bindings/java/jmsg_storage.h b/src/bindings/java/jmsg_storage.h index ac617ca49f..21a855da84 100644 --- a/src/bindings/java/jmsg_storage.h +++ b/src/bindings/java/jmsg_storage.h @@ -16,69 +16,57 @@ SG_BEGIN_DECL() /** * This function returns a new java storage instance. * - * @param env The environment of the current thread + * @param env The environment of the current thread * - * @return A new java storage object. + * @return A new java storage object. * - * @exception If the class Storage is not found the function throws - * the ClassNotFoundException. If the constructor of - * this class is not found the function throws the exception - * NotSuchMethodException. + * @exception If the class Storage is not found the function throws the ClassNotFoundException. If the constructor of + * this class is not found the function throws the exception NotSuchMethodException. */ jobject jstorage_new_instance(JNIEnv * env); /** * This function associated a native storage to a java storage instance. * - * @param jstorage The java storage instance. - * @param storage The native storage to bind. + * @param jstorage The java storage instance. + * @param storage The native storage to bind. * @param env The environment of the current thread * - * @exception If the class Storage is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Storage is not found the function throws the ClassNotFoundException. If the field bind + * of this class is not found the function throws the exception NotSuchFieldException. */ void jstorage_bind(jobject jstorage, msg_storage_t storage, JNIEnv * env); - /** * This function returns a native storage from a java storage instance. * - * @param jstorage The java storage object from which get the native storage. - * @param env The environment of the current thread + * @param jstorage The java storage object from which get the native storage. + * @param env The environment of the current thread * - * @return The function returns the native storage associated to the - * java storage object. + * @return The function returns the native storage associated to the java storage object. * - * @exception If the class Storage is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Storage is not found the function throws the ClassNotFoundException. If the field bind + * of this class is not found the function throws the exception NotSuchFieldException. */ msg_storage_t jstorage_get_native(JNIEnv * env, jobject jstorage); - /** * Class org_simgrid_msg_Storage * Method nativeInit * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Storage_nativeInit(JNIEnv*, jclass); - +JNIEXPORT void JNICALL Java_org_simgrid_msg_Storage_nativeInit(JNIEnv*, jclass); /** - * This function returns a global reference to the java storage instance - * specified by the parameter jstorage. + * This function returns a global reference to the java storage instance specified by the parameter jstorage. * - * @param jstorage The original java storage instance. - * @param env The environment of the current thread + * @param jstorage The original java storage instance. + * @param env The environment of the current thread * - * @return The global reference to the original java storage - * instance. + * @return The global reference to the original java storage instance. */ jobject jstorage_ref(JNIEnv * env, jobject jstorage); + /** * This function delete a global reference to a java storage instance. * @@ -130,8 +118,8 @@ JNIEXPORT jlong JNICALL Java_org_simgrid_msg_Storage_getUsedSize(JNIEnv *, jobje * Method getProperty * Signature (Ljava/lang/String;)Ljava/lang/String; */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Storage_getProperty(JNIEnv *env, jobject jstorage, jobject jname); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getProperty(JNIEnv *env, jobject jstorage, jobject jname); + /* * Class org_simgrid_msg_Storage * Method setProperty @@ -145,16 +133,13 @@ Java_org_simgrid_msg_Storage_setProperty(JNIEnv *env, jobject jstorage, jobject * Method getHost * Signature (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getHost(JNIEnv * env,jobject jstorage); /** * Class org_simgrid_msg_Storage * Method all */ -JNIEXPORT jobjectArray JNICALL -Java_org_simgrid_msg_Storage_all(JNIEnv *, jclass); +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv *, jclass); SG_END_DECL() - #endif /*!MSG_JSTORAGE_H */ diff --git a/src/bindings/java/jmsg_synchro.cpp b/src/bindings/java/jmsg_synchro.cpp index b8791b470e..ca24ac82e0 100644 --- a/src/bindings/java/jmsg_synchro.cpp +++ b/src/bindings/java/jmsg_synchro.cpp @@ -15,22 +15,20 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static jfieldID jsyncro_field_Mutex_bind; -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls) { jsyncro_field_Mutex_bind = jxbt_get_sfield(env, "org/simgrid/msg/Mutex", "bind", "J"); if (!jsyncro_field_Mutex_bind) { jxbt_throw_native(env,bprintf("Can't find some fields in Java class. You should report this bug.")); } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj) { xbt_mutex_t mutex = xbt_mutex_init(); env->SetLongField(obj, jsyncro_field_Mutex_bind, (jlong) (uintptr_t) (mutex)); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj) { xbt_mutex_t mutex; mutex = (xbt_mutex_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Mutex_bind); @@ -43,16 +41,14 @@ Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj) { } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_release(JNIEnv * env, jobject obj) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_release(JNIEnv * env, jobject obj) { xbt_mutex_t mutex; mutex = (xbt_mutex_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Mutex_bind); xbt_mutex_release(mutex); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_nativeFinalize(JNIEnv * env, jobject obj) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeFinalize(JNIEnv * env, jobject obj) { xbt_mutex_t mutex; mutex = (xbt_mutex_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Mutex_bind); @@ -61,23 +57,20 @@ Java_org_simgrid_msg_Mutex_nativeFinalize(JNIEnv * env, jobject obj) { static jfieldID jsyncro_field_Semaphore_bind; -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeInit(JNIEnv *env, jclass cls) { jsyncro_field_Semaphore_bind = jxbt_get_sfield(env, "org/simgrid/msg/Semaphore", "bind", "J"); if (!jsyncro_field_Semaphore_bind) { jxbt_throw_native(env,bprintf("Can't find some fields in Semaphore Java class. You should report this bug.")); } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_init(JNIEnv * env, jobject obj, jint capacity) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_init(JNIEnv * env, jobject obj, jint capacity) { msg_sem_t sem = MSG_sem_init((int) capacity); env->SetLongField(obj, jsyncro_field_Semaphore_bind, (jlong) (uintptr_t) (sem)); } - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_acquire(JNIEnv * env, jobject obj, jdouble timeout) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_acquire(JNIEnv * env, jobject obj, jdouble timeout) { msg_sem_t sem; sem = (msg_sem_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Semaphore_bind); @@ -87,15 +80,14 @@ Java_org_simgrid_msg_Semaphore_acquire(JNIEnv * env, jobject obj, jdouble timeou } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_release(JNIEnv * env, jobject obj) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_release(JNIEnv * env, jobject obj) { msg_sem_t sem; sem = (msg_sem_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Semaphore_bind); MSG_sem_release(sem); } -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * env, jobject obj) { + +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * env, jobject obj) { msg_sem_t sem; sem = (msg_sem_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Semaphore_bind); @@ -103,8 +95,7 @@ Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * env, jobject obj) { return (jboolean) res; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * env, jobject obj) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * env, jobject obj) { msg_sem_t sem; sem = (msg_sem_t) (uintptr_t) env->GetLongField(obj, jsyncro_field_Semaphore_bind); diff --git a/src/bindings/java/jmsg_synchro.h b/src/bindings/java/jmsg_synchro.h index 6d66626810..4db16a7109 100644 --- a/src/bindings/java/jmsg_synchro.h +++ b/src/bindings/java/jmsg_synchro.h @@ -15,35 +15,17 @@ SG_BEGIN_DECL() -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls); - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj); - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj); - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_release(JNIEnv * env, jobject obj); - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Mutex_nativeFinalize(JNIEnv * env, jobject obj); - - -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_nativeInit(JNIEnv *env, jclass cls); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_init(JNIEnv * env, jobject obj, jint capacity); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_acquire(JNIEnv * env, jobject obj, jdouble timeout); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_release(JNIEnv * env, jobject obj); -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * env, jobject obj); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * env, jobject obj); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_init(JNIEnv * env, jobject obj); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_acquire(JNIEnv * env, jobject obj); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_release(JNIEnv * env, jobject obj); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Mutex_nativeFinalize(JNIEnv * env, jobject obj); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_init(JNIEnv * env, jobject obj, jint capacity); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_acquire(JNIEnv * env, jobject obj, jdouble timeout); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_release(JNIEnv * env, jobject obj); +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Semaphore_wouldBlock(JNIEnv * env, jobject obj); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Semaphore_nativeFinalize(JNIEnv * env, jobject obj); SG_END_DECL() - #endif /* !MSG_JPROCESS_H */ diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index d86e9582de..5e83bf3a2b 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -7,11 +7,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "jmsg.h" - #include "jmsg_host.h" #include "jmsg_task.h" #include "jmsg_process.h" - #include "jxbt_utilities.h" #include @@ -42,8 +40,7 @@ jboolean jtask_is_valid(jobject jtask, JNIEnv * env) return env->GetLongField(jtask, jtask_field_Task_bind) ? JNI_TRUE : JNI_FALSE; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) { jclass jtask_class_Comm = env->FindClass("org/simgrid/msg/Comm"); jclass jtask_class_Task = env->FindClass("org/simgrid/msg/Task"); @@ -60,27 +57,19 @@ Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) { } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_create(JNIEnv * env, - jobject jtask, jstring jname, - jdouble jflopsAmount, - jdouble jbytesAmount) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_create(JNIEnv * env, jobject jtask, jstring jname, + jdouble jflopsAmount, jdouble jbytesAmount) { msg_task_t task; /* the native task to create */ const char *name = NULL; /* the name of the task */ if (jflopsAmount < 0) { - jxbt_throw_illegal(env, - bprintf - ("Task flopsAmount (%f) cannot be negative", - (double) jflopsAmount)); + jxbt_throw_illegal(env, bprintf("Task flopsAmount (%f) cannot be negative", (double) jflopsAmount)); return; } if (jbytesAmount < 0) { - jxbt_throw_illegal(env, - bprintf("Task bytesAmount (%f) cannot be negative", - (double) jbytesAmount)); + jxbt_throw_illegal(env, bprintf("Task bytesAmount (%f) cannot be negative", (double) jbytesAmount)); return; } @@ -90,9 +79,7 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env, } /* create the task */ - task = - MSG_task_create(name, (double) jflopsAmount, - (double) jbytesAmount, NULL); + task = MSG_task_create(name, (double) jflopsAmount, (double) jbytesAmount, NULL); if (jname) env->ReleaseStringUTFChars(jname, name); /* sets the task name */ @@ -102,16 +89,10 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env, MSG_task_set_data(task, jtask); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, - jobject jtask, - jstring jname, - jobjectArray jhosts, - jdoubleArray - jcomputeDurations_arg, - jdoubleArray - jmessageSizes_arg) { - +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jobject jtask, jstring jname, + jobjectArray jhosts, jdoubleArray jcomputeDurations_arg, + jdoubleArray jmessageSizes_arg) +{ msg_task_t task; /* the native parallel task to create */ const char *name; /* the name of the task */ int host_count; @@ -120,21 +101,16 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, double *messageSizes; jdouble *jcomputeDurations; jdouble *jmessageSizes; - jobject jhost; int index; if (!jcomputeDurations_arg) { - jxbt_throw_null(env, - xbt_strdup - ("Parallel task flops amounts cannot be null")); + jxbt_throw_null(env, xbt_strdup("Parallel task flops amounts cannot be null")); return; } if (!jmessageSizes_arg) { - jxbt_throw_null(env, - xbt_strdup - ("Parallel task bytes amounts cannot be null")); + jxbt_throw_null(env, xbt_strdup("Parallel task bytes amounts cannot be null")); return; } @@ -145,15 +121,12 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, host_count = (int) env->GetArrayLength(jhosts); - hosts = xbt_new0(msg_host_t, host_count); computeDurations = xbt_new0(double, host_count); messageSizes = xbt_new0(double, host_count * host_count); - jcomputeDurations = - env->GetDoubleArrayElements(jcomputeDurations_arg, 0); - jmessageSizes = - env->GetDoubleArrayElements(jmessageSizes_arg, 0); + jcomputeDurations = env->GetDoubleArrayElements(jcomputeDurations_arg, 0); + jmessageSizes = env->GetDoubleArrayElements(jmessageSizes_arg, 0); for (index = 0; index < host_count; index++) { jhost = env->GetObjectArrayElement(jhosts, index); @@ -164,16 +137,13 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, messageSizes[index] = jmessageSizes[index]; } - env->ReleaseDoubleArrayElements(jcomputeDurations_arg, - jcomputeDurations, 0); + env->ReleaseDoubleArrayElements(jcomputeDurations_arg, jcomputeDurations, 0); env->ReleaseDoubleArrayElements(jmessageSizes_arg, jmessageSizes, 0); /* get the C string from the java string */ name = env->GetStringUTFChars(jname, 0); - task = - MSG_parallel_task_create(name, host_count, hosts, computeDurations, - messageSizes, NULL); + task = MSG_parallel_task_create(name, host_count, hosts, computeDurations, messageSizes, NULL); env->ReleaseStringUTFChars(jname, name); /* sets the task name */ @@ -187,9 +157,7 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jxbt_throw_jni(env, "global ref allocation failed"); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_cancel(JNIEnv * env, - jobject jtask) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel(JNIEnv * env, jobject jtask) { msg_task_t ptask = jtask_to_native_task(jtask, env); @@ -200,12 +168,10 @@ Java_org_simgrid_msg_Task_cancel(JNIEnv * env, msg_error_t rv = MSG_task_cancel(ptask); - jxbt_check_res("MSG_task_cancel()", rv, MSG_OK, - bprintf("unexpected error , please report this bug")); + jxbt_check_res("MSG_task_cancel()", rv, MSG_OK, bprintf("unexpected error , please report this bug")); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask) { msg_task_t task = jtask_to_native_task(jtask, env); @@ -222,8 +188,7 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask) } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble bound) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble bound) { msg_task_t task = jtask_to_native_task(jtask, env); @@ -234,9 +199,7 @@ Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble bound) MSG_task_set_bound(task, bound); } -JNIEXPORT jstring JNICALL -Java_org_simgrid_msg_Task_getName(JNIEnv * env, - jobject jtask) { +JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName(JNIEnv * env, jobject jtask) { msg_task_t task = jtask_to_native_task(jtask, env); if (!task) { @@ -247,9 +210,7 @@ Java_org_simgrid_msg_Task_getName(JNIEnv * env, return env->NewStringUTF(MSG_task_get_name(task)); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_getSender(JNIEnv * env, - jobject jtask) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobject jtask) { msg_process_t process; msg_task_t task = jtask_to_native_task(jtask, env); @@ -266,9 +227,7 @@ Java_org_simgrid_msg_Task_getSender(JNIEnv * env, return (jobject) native_to_java_process(process); } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_getSource(JNIEnv * env, - jobject jtask) +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobject jtask) { msg_host_t host; msg_task_t task = jtask_to_native_task(jtask, env); @@ -290,8 +249,7 @@ Java_org_simgrid_msg_Task_getSource(JNIEnv * env, return (jobject) host->extension(JAVA_HOST_LEVEL); } -JNIEXPORT jdouble JNICALL -Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, jobject jtask) +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, jobject jtask) { msg_task_t ptask = jtask_to_native_task(jtask, env); @@ -302,8 +260,7 @@ Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, jobject jtask) return (jdouble) MSG_task_get_flops_amount(ptask); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) { msg_task_t task = jtask_to_native_task(jtask, env); if (!task) { @@ -317,9 +274,8 @@ Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) { env->ReleaseStringUTFChars((jstring) jname, name); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, - jobject jtask, jdouble priority) + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, jobject jtask, jdouble priority) { msg_task_t task = jtask_to_native_task(jtask, env); @@ -329,9 +285,9 @@ Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, } MSG_task_set_priority(task, (double) priority); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setFlopsAmount - (JNIEnv *env, jobject jtask, jdouble computationAmount) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setFlopsAmount (JNIEnv *env, jobject jtask, jdouble computationAmount) +{ msg_task_t task = jtask_to_native_task(jtask, env); if (!task) { @@ -340,9 +296,9 @@ Java_org_simgrid_msg_Task_setFlopsAmount } MSG_task_set_flops_amount(task, (double) computationAmount); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setBytesAmount - (JNIEnv *env, jobject jtask, jdouble dataSize) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBytesAmount (JNIEnv *env, jobject jtask, jdouble dataSize) +{ msg_task_t task = jtask_to_native_task(jtask, env); if (!task) { @@ -353,17 +309,13 @@ Java_org_simgrid_msg_Task_setBytesAmount MSG_task_set_bytes_amount(task, (double) dataSize); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask, - jstring jalias, - jdouble jtimeout) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask, jstring jalias, jdouble jtimeout) { msg_error_t rv; const char *alias = env->GetStringUTFChars(jalias, 0); msg_task_t task = jtask_to_native_task(jtask, env); - if (!task) { env->ReleaseStringUTFChars(jalias, alias); jxbt_throw_notbound(env, "task", jtask); @@ -380,18 +332,14 @@ Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask, } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask, - jstring jalias, - jdouble jtimeout, - jdouble maxrate) +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask, jstring jalias, + jdouble jtimeout,jdouble maxrate) { msg_error_t rv; const char *alias = env->GetStringUTFChars(jalias, 0); msg_task_t task = jtask_to_native_task(jtask, env); - if (!task) { env->ReleaseStringUTFChars(jalias, alias); jxbt_throw_notbound(env, "task", jtask); @@ -408,10 +356,8 @@ Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask, } } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls, - jstring jalias, jdouble jtimeout, - jobject jhost) +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls, jstring jalias, jdouble jtimeout, + jobject jhost) { msg_error_t rv; msg_task_t *task = xbt_new(msg_task_t,1); @@ -452,9 +398,7 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls, return (jobject) jtask_local; } - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) { msg_comm_t comm; const char *mailbox; jclass comm_class; @@ -488,11 +432,8 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) { return jcomm; } - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, jclass cls, - jstring jalias, jdouble jtimeout, - jobject jhost, jdouble rate) +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, jclass cls, jstring jalias, + jdouble jtimeout, jobject jhost, jdouble rate) { msg_error_t rv; msg_task_t *task = xbt_new(msg_task_t,1); @@ -533,10 +474,9 @@ Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, jclass cls, return (jobject) jtask_local; } - -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, jclass cls, - jstring jmailbox, jdouble rate) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, jclass cls, jstring jmailbox, + jdouble rate) +{ msg_comm_t comm; const char *mailbox; jclass comm_class; @@ -570,16 +510,13 @@ Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, jclass cls, return jcomm; } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) +{ jclass comm_class; - - const char *mailbox; - msg_task_t task; - jobject jcomm; msg_comm_t comm; + const char *mailbox; comm_class = env->FindClass("org/simgrid/msg/Comm"); @@ -597,7 +534,7 @@ Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) { return NULL; } -MSG_task_set_data(task, (void *) env->NewGlobalRef(jtask)); + MSG_task_set_data(task, (void *) env->NewGlobalRef(jtask)); comm = MSG_task_isend(task,mailbox); env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); @@ -609,16 +546,14 @@ MSG_task_set_data(task, (void *) env->NewGlobalRef(jtask)); return jcomm; } -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmailbox, jdouble maxrate) { +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmailbox, + jdouble maxrate) +{ jclass comm_class; - - const char *mailbox; - msg_task_t task; - jobject jcomm; msg_comm_t comm; + const char *mailbox; comm_class = env->FindClass("org/simgrid/msg/Comm"); @@ -648,8 +583,8 @@ Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmail return jcomm; } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_nativeFinalize(JNIEnv * env, jobject jtask) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeFinalize(JNIEnv * env, jobject jtask) +{ msg_task_t task = jtask_to_native_task(jtask, env); if (!task) { @@ -671,14 +606,12 @@ static void msg_task_cancel_on_failed_dsend(void*t) { MSG_task_destroy(task); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask, - jstring jalias) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask, jstring jalias) +{ const char *alias = env->GetStringUTFChars(jalias, 0); msg_task_t task = jtask_to_native_task(jtask, env); - if (!task) { env->ReleaseStringUTFChars(jalias, alias); jxbt_throw_notbound(env, "task", jtask); @@ -692,14 +625,13 @@ Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask, env->ReleaseStringUTFChars(jalias, alias); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobject jtask, - jstring jalias, jdouble maxrate) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobject jtask, jstring jalias, + jdouble maxrate) +{ const char *alias = env->GetStringUTFChars(jalias, 0); msg_task_t task = jtask_to_native_task(jtask, env); - if (!task) { env->ReleaseStringUTFChars(jalias, alias); jxbt_throw_notbound(env, "task", jtask); @@ -713,10 +645,7 @@ Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobject jtask, env->ReleaseStringUTFChars(jalias, alias); } - - -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls, jstring jalias) +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls, jstring jalias) { const char *alias; int rv; @@ -728,9 +657,8 @@ Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls, jstring jalias) return (jboolean) rv; } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, jstring jalias, jobject jhost) - { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, jstring jalias, jobject jhost) +{ int rv; const char *alias; @@ -747,9 +675,7 @@ Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, jstring jalia return (jint) rv; } - -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls, jstring jalias) +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls, jstring jalias) { int rv; const char *alias = env->GetStringUTFChars(jalias, 0); diff --git a/src/bindings/java/jmsg_task.h b/src/bindings/java/jmsg_task.h index 2a89b6e2ab..e3846559bb 100644 --- a/src/bindings/java/jmsg_task.h +++ b/src/bindings/java/jmsg_task.h @@ -17,43 +17,36 @@ SG_BEGIN_DECL() /** * This function associated a native task to a java task instance. * - * @param jtask The java task instance. - * @param task The native task to bind. + * @param jtask The java task instance. + * @param task The native task to bind. * @param env The environment of the current thread. * - * @exception If the class Task is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Task is not found the function throws the ClassNotFoundException. If the field bind of + * this class is not found the function throws the exception NotSuchFieldException. */ void jtask_bind(jobject jtask, msg_task_t task, JNIEnv * env); /** * This function returns a native task from a java task instance. * - * @param jtask The java task object from which get the native task. - * @param env The environment of the current thread. + * @param jtask The java task object from which get the native task. + * @param env The environment of the current thread. * - * @return The function returns the native task associated to the - * java task object. + * @return The function returns the native task associated to the java task object. * - * @exception If the class Task is not found the function throws - * the ClassNotFoundException. If the field bind of - * this class is not found the function throws the exception - * NotSuchFieldException. + * @exception If the class Task is not found the function throws the ClassNotFoundException. If the field bind of + * this class is not found the function throws the exception NotSuchFieldException. */ msg_task_t jtask_to_native_task(jobject jtask, JNIEnv * env); /** * This function tests if a java task instance is valid. - * A java task object is valid if it is bind to a native - * task. + * A java task object is valid if it is bind to a native task. * - * @param jtask The java task to test the validity. + * @param jtask The java task to test the validity. * @param env The environment of the current thread. * - * @return If the java task is valid the function returns true. - * Otherwise the function returns false. + * @return If the java task is valid the function returns true. Otherwise the function returns false. */ jboolean jtask_is_valid(jobject jtask, JNIEnv * env); @@ -62,219 +55,190 @@ jboolean jtask_is_valid(jobject jtask, JNIEnv * env); * Method nativeInit * Signature (); */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls); /* * Class org_simgrid_msg_Task * Method create */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_create - (JNIEnv * env, jobject jtask, jstring jname, jdouble jcomputeDuration, jdouble jmessageSize); -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_nativeFinalize(JNIEnv * env, jobject jtask); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_create (JNIEnv * env, jobject jtask, jstring jname, + jdouble jcomputeDuration, jdouble jmessageSize); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeFinalize(JNIEnv * env, jobject jtask); + /* * Class org_simgrid_msg_Task * Method parallelCreate */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_parallelCreate - (JNIEnv *, jobject, - jstring, jobjectArray, - jdoubleArray, - jdoubleArray); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate (JNIEnv *, jobject, jstring, jobjectArray, + jdoubleArray, jdoubleArray); + /* * Class org_simgrid_msg_Task * Method destroy * Signature (Lsimgrid/msg/Task;)V */ -/* JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_destroy */ -/* (JNIEnv *, jobject); */ +/* JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_destroy (JNIEnv *, jobject); */ /* * Class org_simgrid_msg_Task * Method cancel * Signature ()V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel - (JNIEnv *, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel (JNIEnv *, jobject); /* * Class org_simgrid_msg_Task * Method execute * Signature ()V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute - (JNIEnv *, jobject); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute (JNIEnv *, jobject); /* * Class org_simgrid_msg_Task * Method setBound * Signature ()V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBound - (JNIEnv *, jobject, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBound (JNIEnv *, jobject, jdouble); /* * Class org_simgrid_msg_Task * Method getName * Signature ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName - (JNIEnv *, jobject); +JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName (JNIEnv *, jobject); /* * Class org_simgrid_msg_Task * Method getSender * Signature ()Lsimgrid/msg/Process; */ -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender - (JNIEnv *, jobject); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender (JNIEnv *, jobject); + /* * Class org_simgrid_msg_Task * Method getSource * Signature ()Lsimgrid/msg/Host; */ -JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource - (JNIEnv *, jobject); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource (JNIEnv *, jobject); + /* * Class org_simgrid_msg_Task * Method getFlopsAmount * Signature ()D */ -JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount - (JNIEnv *, jobject); +JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount (JNIEnv *, jobject); /** * Class org_simgrid_msg_Task * Method setName * Signature (Ljava/lang/string;)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname); + /* * Class org_simgrid_msg_Task * Method setPriority * Signature (D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority - (JNIEnv *, jobject, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority (JNIEnv *, jobject, jdouble); + /** * Class org_simgrid_msg_Task * Method setComputeDuration * Signature (D)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setFlopsAmount - (JNIEnv *env, jobject jtask, jdouble computationAmount); - - /** +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setFlopsAmount (JNIEnv *env, jobject jtask, jdouble computationAmount); + +/** * Class org_simgrid_msg_Task * Method setDataSize * Signature (D)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_setBytesAmount - (JNIEnv *env, jobject jtask, jdouble dataSize); - +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBytesAmount (JNIEnv *env, jobject jtask, jdouble dataSize); + /** * Class org_simgrid_msg_Task * Method send */ -JNIEXPORT void JNICALL - Java_org_simgrid_msg_Task_send - (JNIEnv *, jobject, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_send (JNIEnv *, jobject, jstring, jdouble); /** * Class org_simgrid_msg_Task * Method sendBounded */ -JNIEXPORT void JNICALL - Java_org_simgrid_msg_Task_sendBounded - (JNIEnv *, jobject, jstring, jdouble, jdouble); - +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded (JNIEnv *, jobject, jstring, jdouble, jdouble); /** * Class org_simgrid_msg_Task * Method receive */ -JNIEXPORT jobject JNICALL - Java_org_simgrid_msg_Task_receive - (JNIEnv *, jclass, jstring, jdouble, jobject); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive (JNIEnv *, jclass, jstring, jdouble, jobject); /** * Class org_simgrid_msg_Task * Method irecv * Signature (Ljava/lang/String;)Lorg/simgrid/msg/Comm; */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox); + /** * Class org_simgrid_msg_Task * Method receiveBounded */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, jclass cls, - jstring jalias, jdouble jtimeout, - jobject jhost, jdouble rate); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, jclass cls, jstring jalias, + jdouble jtimeout, jobject jhost, jdouble rate); + /** * Class org_simgrid_msg_Task * Method irecvBounded */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, jclass cls, - jstring jmailbox, jdouble rate); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, jclass cls, jstring jmailbox, + jdouble rate); + /** * Class org_simgrid_msg_Task * Method isend * Signature (Lorg/simgrid/msg/Task;Ljava/lang/String;)Lorg/simgrid/msg/Comm; */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox); + /** * Class org_simgrid_msg_Task * Method isendBounded */ -JNIEXPORT jobject JNICALL -Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmailbox, jdouble maxrate); +JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmailbox, + jdouble maxrate); /** * Class org_simgrid_msg_Task * Method dsend */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask, - jstring jalias); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask, jstring jalias); /** * Class org_simgrid_msg_Task * Method dsendBounded */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobject jtask, - jstring jalias, jdouble maxrate); +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobject jtask, jstring jalias, + jdouble maxrate); /** * Class org_simgrid_msg_Task * Method listen */ -JNIEXPORT jboolean JNICALL -Java_org_simgrid_msg_Task_listen(JNIEnv *, jclass, jstring); +JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Task_listen(JNIEnv *, jclass, jstring); + /** * Class org_simgrid_msg_Task * Method listenFromHost */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Task_listenFromHost(JNIEnv *, jclass, jstring, - jobject); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFromHost(JNIEnv *, jclass, jstring, jobject); + /** * Class org_simgrid_msg_Task * Method listenFrom */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_Task_listenFrom(JNIEnv *, jclass, jstring); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv *, jclass, jstring); SG_END_DECL() - #endif /* !MSG_JTASK_H */ diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index 60c6609ff5..608d9f8248 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -18,15 +18,18 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static jfieldID jvm_field_bind; -void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm) { +void jvm_bind(JNIEnv *env, jobject jvm, msg_vm_t vm) +{ env->SetLongField(jvm, jvm_field_bind, (intptr_t)vm); } -msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm) { + +msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm) +{ return (msg_vm_t)(intptr_t)env->GetLongField(jvm, jvm_field_bind); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cls) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cls) +{ jclass jprocess_class_VM = env->FindClass("org/simgrid/msg/VM"); jvm_field_bind = jxbt_get_jfield(env, jprocess_class_VM, "bind", "J"); if (!jvm_field_bind ) { @@ -34,59 +37,58 @@ Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass cls) { } } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isCreated(JNIEnv * env, jobject jvm) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv * env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); return (jint) MSG_vm_is_created(vm); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isRunning(JNIEnv * env, jobject jvm) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv * env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); return (jint) MSG_vm_is_running(vm); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isMigrating(JNIEnv * env, jobject jvm) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv * env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); return (jint) MSG_vm_is_migrating(vm); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isSuspended(JNIEnv * env, jobject jvm) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv * env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); return (jint) MSG_vm_is_suspended(vm); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isSaving(JNIEnv * env, jobject jvm) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaving(JNIEnv * env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); return (jint) MSG_vm_is_saving(vm); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isSaved(JNIEnv * env, jobject jvm) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaved(JNIEnv * env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); return (jint) MSG_vm_is_saved(vm); } -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isRestoring(JNIEnv * env, jobject jvm) { +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRestoring(JNIEnv * env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); return (jint) MSG_vm_is_restoring(vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound) { - +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_set_bound(vm, bound); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring jname, - jint jncore, jint jramsize, jint jnetcap, jstring jdiskpath, jint jdisksize, jint jmig_netspeed, jint jdp_intensity) { - +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring jname, + jint jncore, jint jramsize, jint jnetcap, jstring jdiskpath, + jint jdisksize, jint jmig_netspeed, jint jdp_intensity) +{ msg_host_t host = jhost_get_native(env, jhost); const char *name; @@ -98,62 +100,64 @@ Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring // disk_path = (*env)->GetStringUTFChars(env, jdiskpath, 0); // disk_path = xbt_strdup(disk_path); - msg_vm_t vm = MSG_vm_create(host, name, (int) jncore, (int) jramsize, - (int) jnetcap, NULL, (int) jdisksize, (int) jmig_netspeed, (int) jdp_intensity); + msg_vm_t vm = MSG_vm_create(host, name, (int) jncore, (int) jramsize, (int) jnetcap, NULL, (int) jdisksize, + (int) jmig_netspeed, (int) jdp_intensity); jvm_bind(env,jvm,vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_destroy(vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_start(vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_shutdown(vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost) +{ msg_vm_t vm = jvm_get_native(env,jvm); msg_host_t host = jhost_get_native(env, jhost); xbt_ex_t e; TRY{ - MSG_vm_migrate(vm,host); + MSG_vm_migrate(vm,host); } CATCH(e){ XBT_VERB("CATCH EXCEPTION MIGRATION %s",e.msg); xbt_ex_free(e); jxbt_throw_host_failure(env, (char*)"during migration"); - } + } } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_suspend(vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_resume(vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm) { +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_save(vm); } -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm) { + +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm) +{ msg_vm_t vm = jvm_get_native(env,jvm); MSG_vm_restore(vm); } diff --git a/src/bindings/java/jmsg_vm.h b/src/bindings/java/jmsg_vm.h index 12de5fd706..f3c0a507a6 100644 --- a/src/bindings/java/jmsg_vm.h +++ b/src/bindings/java/jmsg_vm.h @@ -22,139 +22,135 @@ msg_vm_t jvm_get_native(JNIEnv *env, jobject jvm); * Method nativeInit * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeInit(JNIEnv *env, jclass); /** * Class org_simgrid_msg_VM * Method isCreated * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isCreated(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isCreated(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method isRunning * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isRunning(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRunning(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method isMigrating * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isMigrating(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isMigrating(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method isSuspended * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isSuspended(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSuspended(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method isResuming * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isResuming(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isResuming(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method isSuspended * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isSaving(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaving(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method isSave * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isSaved(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isSaved(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method isResuming * Signature ()B */ -JNIEXPORT jint JNICALL -Java_org_simgrid_msg_VM_isRestoring(JNIEnv *env, jobject jvm); +JNIEXPORT jint JNICALL Java_org_simgrid_msg_VM_isRestoring(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method setBound * Signature (D)B */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_setBound(JNIEnv *env, jobject jvm, jdouble bound); /** * Class org_simgrid_msg_VM * Method create * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring jname, - jint jncore, jint jramsize, jint jnetcap, jstring jdiskpath, jint jdisksize, jint dprate, jint mig_netspeed); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_create(JNIEnv *env, jobject jvm, jobject jhost, jstring jname, + jint jncore, jint jramsize, jint jnetcap, jstring jdiskpath, + jint jdisksize, jint dprate, jint mig_netspeed); /** * Class org_simgrid_msg_VM * Method destroy * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_nativeFinalize(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method start * Signature (I)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_start(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method nativeMigrate * Signature (Lorg/simgrid/msg/Host;)V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_internalmig(JNIEnv *env, jobject jvm, jobject jhost); + /** * Class org_simgrid_msg_VM * Method suspend * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_suspend(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method resume * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_resume(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method shutdown * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_shutdown(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method save * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_save(JNIEnv *env, jobject jvm); + /** * Class org_simgrid_msg_VM * Method restore * Signature ()V */ -JNIEXPORT void JNICALL -Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm); +JNIEXPORT void JNICALL Java_org_simgrid_msg_VM_restore(JNIEnv *env, jobject jvm); SG_END_DECL() - #endif diff --git a/src/bindings/java/jtrace.cpp b/src/bindings/java/jtrace.cpp index 343934001d..3502fc918d 100644 --- a/src/bindings/java/jtrace.cpp +++ b/src/bindings/java/jtrace.cpp @@ -24,74 +24,68 @@ // Define a new category XBT_LOG_NEW_DEFAULT_CATEGORY (jtrace, "TRACE for Java(TM)"); -JNIEXPORT void JNICALL -Java_org_simgrid_trace_Trace_hostStateDeclare(JNIEnv * env, jclass cls, jstring js) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare(JNIEnv * env, jclass cls, jstring js) { const char *s = env->GetStringUTFChars(js, 0); TRACE_host_state_declare(s); env->ReleaseStringUTFChars(js, s); } -JNIEXPORT void JNICALL -Java_org_simgrid_trace_Trace_hostStateDeclareValue - (JNIEnv *env, jclass cls, jstring js_state, jstring js_value, jstring js_color) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclareValue (JNIEnv *env, jclass cls, jstring js_state, + jstring js_value, jstring js_color) { const char *state = env->GetStringUTFChars(js_state, 0); const char *value = env->GetStringUTFChars(js_value, 0); const char *color = env->GetStringUTFChars(js_color, 0); TRACE_host_state_declare_value(state, value, color); - + env->ReleaseStringUTFChars(js_state, state); env->ReleaseStringUTFChars(js_value, value); env->ReleaseStringUTFChars(js_color, color); } -JNIEXPORT void JNICALL -Java_org_simgrid_trace_Trace_hostSetState - (JNIEnv *env, jclass cls, jstring js_host, jstring js_state, jstring js_value) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostSetState (JNIEnv *env, jclass cls, jstring js_host, + jstring js_state, jstring js_value) { const char *host = env->GetStringUTFChars(js_host, 0); const char *state = env->GetStringUTFChars(js_state, 0); const char *value = env->GetStringUTFChars(js_value, 0); TRACE_host_set_state(host, state, value); - + env->ReleaseStringUTFChars(js_host, host); env->ReleaseStringUTFChars(js_state, state); env->ReleaseStringUTFChars(js_value, value); } -JNIEXPORT void JNICALL -Java_org_simgrid_trace_Trace_hostPushState - (JNIEnv *env, jclass cls, jstring js_host, jstring js_state, jstring js_value) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPushState (JNIEnv *env, jclass cls, jstring js_host, + jstring js_state, jstring js_value) { const char *host = env->GetStringUTFChars(js_host, 0); const char *state = env->GetStringUTFChars(js_state, 0); const char *value = env->GetStringUTFChars(js_value, 0); TRACE_host_push_state(host, state, value); - + env->ReleaseStringUTFChars(js_host, host); env->ReleaseStringUTFChars(js_state, state); env->ReleaseStringUTFChars(js_value, value); } -JNIEXPORT void JNICALL -Java_org_simgrid_trace_Trace_hostPopState - (JNIEnv *env, jclass cls, jstring js_host, jstring js_state) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState (JNIEnv *env, jclass cls, jstring js_host, + jstring js_state) { const char *host = env->GetStringUTFChars(js_host, 0); const char *state = env->GetStringUTFChars(js_state, 0); TRACE_host_pop_state(host, state); - + env->ReleaseStringUTFChars(js_host, host); env->ReleaseStringUTFChars(js_state, state); } -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare - (JNIEnv *env, jclass cls, jstring js_state) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *env, jclass cls, jstring js_state) { const char *state = env->GetStringUTFChars(js_state, 0); @@ -100,8 +94,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare env->ReleaseStringUTFChars(js_state, state); } -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet - (JNIEnv *env, jclass cls, jstring js_host, jstring js_state, jdouble value) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *env, jclass cls, jstring js_host, + jstring js_state, jdouble value) { const char *host = env->GetStringUTFChars(js_host, 0); const char *state = env->GetStringUTFChars(js_state, 0); @@ -112,8 +106,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet env->ReleaseStringUTFChars(js_state, state); } -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub - (JNIEnv *env, jclass cls, jstring js_host, jstring js_state, jdouble value) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub (JNIEnv *env, jclass cls, jstring js_host, + jstring js_state, jdouble value) { const char *host = env->GetStringUTFChars(js_host, 0); const char *state = env->GetStringUTFChars(js_state, 0); @@ -124,10 +118,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub env->ReleaseStringUTFChars(js_state, state); } - - -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare - (JNIEnv *env, jclass cls, jstring js_state) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *env, jclass cls, jstring js_state) { const char *state = env->GetStringUTFChars(js_state, 0); @@ -136,8 +127,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare env->ReleaseStringUTFChars(js_state, state); } -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet - (JNIEnv *env, jclass cls, jstring js_vm, jstring js_state, jdouble value) +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *env, jclass cls, jstring js_vm, + jstring js_state, jdouble value) { const char *vm = env->GetStringUTFChars(js_vm, 0); const char *state = env->GetStringUTFChars(js_state, 0); @@ -148,9 +139,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet env->ReleaseStringUTFChars(js_state, state); } -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd - (JNIEnv *env, jclass cls, jstring js_host, jstring js_state, jdouble value) { - +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *env, jclass cls, jstring js_host, + jstring js_state, jdouble value) +{ const char *host = env->GetStringUTFChars(js_host, 0); const char *state = env->GetStringUTFChars(js_state, 0); diff --git a/src/bindings/java/jtrace.h b/src/bindings/java/jtrace.h index 8163775b62..c0a986a2a7 100644 --- a/src/bindings/java/jtrace.h +++ b/src/bindings/java/jtrace.h @@ -13,255 +13,235 @@ #ifdef __cplusplus extern "C" { #endif + /* * Class: org_simgrid_trace_Trace * Method: hostVariableDeclare * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare - (JNIEnv *, jclass, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclare (JNIEnv *, jclass, jstring); /* * Class: org_simgrid_trace_Trace * Method: vmVariableDeclare * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare - (JNIEnv *, jclass, jstring); - +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableDeclare (JNIEnv *, jclass, jstring); /* * Class: org_simgrid_trace_Trace * Method: hostVariableDeclareWithColor * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclareWithColor - (JNIEnv *, jclass, jstring, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableDeclareWithColor (JNIEnv *, jclass, jstring, jstring); /* * Class: org_simgrid_trace_Trace * Method: hostVariableSet * Signature: (Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet - (JNIEnv *, jclass, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSet (JNIEnv *, jclass, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: vmVariableSet * Signature: (Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet - (JNIEnv *, jclass, jstring, jstring, jdouble); - +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_vmVariableSet (JNIEnv *, jclass, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: hostVariableAdd * Signature: (Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd - (JNIEnv *, jclass, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAdd (JNIEnv *, jclass, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: hostVariableSub * Signature: (Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub - (JNIEnv *, jclass, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSub (JNIEnv *, jclass, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: hostVariableSetWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSetWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_hostVariableSetWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: hostVariableAddWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableAddWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_hostVariableAddWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: hostVariableSubWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostVariableSubWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_hostVariableSubWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: getHostVariablesName * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getHostVariablesName - (JNIEnv *, jclass); +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getHostVariablesName (JNIEnv *, jclass); /* * Class: org_simgrid_trace_Trace * Method: linkVariableDeclare * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclare - (JNIEnv *, jclass, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclare (JNIEnv *, jclass, jstring); /* * Class: org_simgrid_trace_Trace * Method: linkVariableDeclareWithColor * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor - (JNIEnv *, jclass, jstring, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableDeclareWithColor (JNIEnv *, jclass, jstring, jstring); /* * Class: org_simgrid_trace_Trace * Method: linkVariableSet * Signature: (Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSet - (JNIEnv *, jclass, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSet (JNIEnv *, jclass, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkVariableAdd * Signature: (Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAdd - (JNIEnv *, jclass, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAdd (JNIEnv *, jclass, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkVariableSub * Signature: (Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSub - (JNIEnv *, jclass, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSub (JNIEnv *, jclass, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkVariableSetWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSetWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_linkVariableSetWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkVariableAddWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableAddWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_linkVariableAddWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkVariableSubWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkVariableSubWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_linkVariableSubWithTime (JNIEnv *, jclass, jdouble, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkSrcDstVariableSet * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSet - (JNIEnv *, jclass, jstring, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_linkSrcDstVariableSet (JNIEnv *, jclass, jstring, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkSrcDstVariableAdd * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd - (JNIEnv *, jclass, jstring, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_linkSrcDstVariableAdd (JNIEnv *, jclass, jstring, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkSrcDstVariableSub * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSub - (JNIEnv *, jclass, jstring, jstring, jstring, jdouble); +JNIEXPORT void JNICALL +Java_org_simgrid_trace_Trace_linkSrcDstVariableSub (JNIEnv *, jclass, jstring, jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkSrcDstVariableSetWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSetWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSetWithTime (JNIEnv *, jclass, jdouble, jstring, + jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkSrcdstVariableAddWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcdstVariableAddWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcdstVariableAddWithTime (JNIEnv *, jclass, jdouble, jstring, + jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: linkSrcDstVariableSubWithTime * Signature: (DLjava/lang/String;Ljava/lang/String;Ljava/lang/String;D)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSubWithTime - (JNIEnv *, jclass, jdouble, jstring, jstring, jstring, jdouble); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_linkSrcDstVariableSubWithTime (JNIEnv *, jclass, jdouble, jstring, + jstring, jstring, jdouble); /* * Class: org_simgrid_trace_Trace * Method: getLinkVariablesName * Signature: ()[Ljava/lang/String; */ -JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getLinkVariablesName - (JNIEnv *, jclass); +JNIEXPORT jobjectArray JNICALL Java_org_simgrid_trace_Trace_getLinkVariablesName (JNIEnv *, jclass); /* * Class: org_simgrid_trace_Trace * Method: hostStateDeclare * Signature: (Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare - (JNIEnv *, jclass, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclare (JNIEnv *, jclass, jstring); /* * Class: org_simgrid_trace_Trace * Method: hostStateDeclareValue * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclareValue - (JNIEnv *, jclass, jstring, jstring, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostStateDeclareValue (JNIEnv *, jclass, jstring, jstring, jstring); /* * Class: org_simgrid_trace_Trace * Method: hostSetState * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostSetState - (JNIEnv *, jclass, jstring, jstring, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostSetState (JNIEnv *, jclass, jstring, jstring, jstring); /* * Class: org_simgrid_trace_Trace * Method: hostPushState * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPushState - (JNIEnv *, jclass, jstring, jstring, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPushState (JNIEnv *, jclass, jstring, jstring, jstring); /* * Class: org_simgrid_trace_Trace * Method: hostPopState * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState - (JNIEnv *, jclass, jstring, jstring); +JNIEXPORT void JNICALL Java_org_simgrid_trace_Trace_hostPopState (JNIEnv *, jclass, jstring, jstring); #ifdef __cplusplus } diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp index 3aaf258deb..885d9d5f9e 100644 --- a/src/bindings/java/jxbt_utilities.cpp +++ b/src/bindings/java/jxbt_utilities.cpp @@ -12,10 +12,6 @@ #include "xbt/str.h" #include "jxbt_utilities.h" -/* *********** */ -/* JNI GETTERS */ -/* *********** */ - jclass jxbt_get_class(JNIEnv * env, const char *name) { jclass cls = env->FindClass(name); @@ -30,8 +26,7 @@ jclass jxbt_get_class(JNIEnv * env, const char *name) return cls; } -jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, - const char *name, const char *signature) +jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature) { jmethodID id; @@ -41,14 +36,11 @@ jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, if (!id) { - jmethodID tostr_id = - env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); - jstring jclassname = - (jstring) env->CallObjectMethod(cls, tostr_id, NULL); + jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); + jstring jclassname = (jstring) env->CallObjectMethod(cls, tostr_id, NULL); const char *classname = env->GetStringUTFChars(jclassname, 0); - char *m = bprintf("Cannot find method %s(%s) in %s", name, signature, - classname); + char *m = bprintf("Cannot find method %s(%s) in %s", name, signature, classname); env->ReleaseStringUTFChars(jclassname, classname); @@ -61,8 +53,7 @@ jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, return id; } -jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, - const char *name, const char *signature) +jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature) { jmethodID id; @@ -71,16 +62,11 @@ jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, id = env->GetStaticMethodID(cls, name, signature); if (!id) { - - jmethodID tostr_id = - env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); - jstring jclassname = - (jstring) env->CallObjectMethod(cls, tostr_id, NULL); + jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); + jstring jclassname = (jstring) env->CallObjectMethod(cls, tostr_id, NULL); const char *classname = env->GetStringUTFChars(jclassname, 0); - char *m = - bprintf("Cannot find static method %s(%s) in %s", name, signature, - classname); + char *m = bprintf("Cannot find static method %s(%s) in %s", name, signature, classname); env->ReleaseStringUTFChars(jclassname, classname); @@ -93,10 +79,8 @@ jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, return id; } -jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, - const char *name, const char *signature) +jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature) { - jclass cls; jmethodID id; cls = jxbt_get_class(env, classname); @@ -107,9 +91,7 @@ jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, id = env->GetStaticMethodID(cls, name, signature); if (!id) { - char *m = - bprintf("Cannot find static method %s(%s) in %s", name, signature, - classname); + char *m = bprintf("Cannot find static method %s(%s) in %s", name, signature, classname); jxbt_throw_jni(env, m); @@ -119,10 +101,8 @@ jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, return id; } -jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, - const char *name, const char *signature) +jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature) { - jclass cls; jmethodID id; cls = jxbt_get_class(env, classname); @@ -133,8 +113,7 @@ jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, id = env->GetMethodID(cls, name, signature); if (!id) { - char *m = bprintf("Cannot find method %s(%s) in %s", name, signature, - classname); + char *m = bprintf("Cannot find method %s(%s) in %s", name, signature, classname); jxbt_throw_jni(env, m); @@ -144,8 +123,7 @@ jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, return id; } -jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, - const char *name, const char *signature) +jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char *signature) { jfieldID id; @@ -155,13 +133,10 @@ jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, id = env->GetFieldID(cls, name, signature); if (!id) { - jmethodID getname_id = - env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); - jstring jclassname = - (jstring) env->CallObjectMethod(cls, getname_id, NULL); + jmethodID getname_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;"); + jstring jclassname = (jstring) env->CallObjectMethod(cls, getname_id, NULL); const char *classname = env->GetStringUTFChars(jclassname, 0); - char *m = bprintf("Cannot find field %s %s in %s", signature, name, - classname); + char *m = bprintf("Cannot find field %s %s in %s", signature, name, classname); env->ReleaseStringUTFChars(jclassname, classname); @@ -174,8 +149,7 @@ jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, return id; } -jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, - const char *name, const char *signature) +jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, const char *name, const char *signature) { jclass cls = jxbt_get_class(env, classname); jfieldID id; @@ -186,8 +160,7 @@ jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, id = env->GetFieldID(cls, name, signature); if (!id) { - char *m = bprintf("Cannot find field %s %s in %s", signature, name, - classname); + char *m = bprintf("Cannot find field %s %s in %s", signature, name, classname); jxbt_throw_jni(env, m); @@ -198,36 +171,25 @@ jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, return id; } -/* ***************** */ -/* EXCEPTION RAISING */ -/* ***************** */ void jxbt_throw_by_name(JNIEnv * env, const char *name, char *msg) { jclass cls = env->FindClass(name); - xbt_assert(cls, "%s (Plus severe error: class %s not found)\n", msg, - name); + xbt_assert(cls, "%s (Plus severe error: class %s not found)\n", msg, name); env->ThrowNew(cls, msg); free(msg); } - -/* Errors in MSG */ void jxbt_throw_jni(JNIEnv * env, const char *msg) { - jxbt_throw_by_name(env, - "org/simgrid/msg/JniException", - bprintf("Internal or JNI error: %s", msg)); + jxbt_throw_by_name(env, "org/simgrid/msg/JniException", bprintf("Internal or JNI error: %s", msg)); } void jxbt_throw_notbound(JNIEnv * env, const char *kind, void *pointer) { - jxbt_throw_by_name(env, - "org/simgrid/msg/JniException", - bprintf("Internal error: %s %p not bound", kind, - pointer)); + jxbt_throw_by_name(env, "org/simgrid/msg/JniException", bprintf("Internal error: %s %p not bound", kind, pointer)); } void jxbt_throw_native(JNIEnv * env, char *msg) @@ -235,13 +197,11 @@ void jxbt_throw_native(JNIEnv * env, char *msg) jxbt_throw_by_name(env, "org/simgrid/msg/NativeException", msg); } -/* *** */ void jxbt_throw_null(JNIEnv * env, char *msg) { jxbt_throw_by_name(env, "java/lang/NullPointerException", msg); } -/* Errors on user side */ void jxbt_throw_illegal(JNIEnv * env, char *msg) { jxbt_throw_by_name(env, "java/lang/IllegalArgumentException", msg); @@ -249,56 +209,35 @@ void jxbt_throw_illegal(JNIEnv * env, char *msg) void jxbt_throw_host_not_found(JNIEnv * env, const char *invalid_name) { - jxbt_throw_by_name(env, - "org/simgrid/msg/HostNotFoundException", - bprintf("No such host: %s", invalid_name)); + jxbt_throw_by_name(env, "org/simgrid/msg/HostNotFoundException", bprintf("No such host: %s", invalid_name)); } void jxbt_throw_storage_not_found(JNIEnv * env, const char *invalid_name) { - jxbt_throw_by_name(env, - "org/simgrid/msg/StorageNotFoundException", - bprintf("No such storage: %s", invalid_name)); + jxbt_throw_by_name(env, "org/simgrid/msg/StorageNotFoundException", bprintf("No such storage: %s", invalid_name)); } - void jxbt_throw_process_not_found(JNIEnv * env, const char *invalid_name) { - jxbt_throw_by_name(env, - "org/simgrid/msg/ProcessNotFoundException", - bprintf("No such process: %s", invalid_name)); + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessNotFoundException", bprintf("No such process: %s", invalid_name)); } -// tranfert failure void jxbt_throw_transfer_failure(JNIEnv * env, char *details) { - jxbt_throw_by_name(env, "org/simgrid/msg/TransferFailureException", details); - } -// host failure Exception void jxbt_throw_host_failure(JNIEnv * env, char *details) { - - jxbt_throw_by_name(env, - "org/simgrid/msg/HostFailureException", - bprintf("Host Failure %s", details)); - + jxbt_throw_by_name(env, "org/simgrid/msg/HostFailureException", bprintf("Host Failure %s", details)); } -// time out failure Exception void jxbt_throw_time_out_failure(JNIEnv * env, char *details) { - jxbt_throw_by_name(env, "org/simgrid/msg/TimeoutException", details); - } -// task Cancelled exception void jxbt_throw_task_cancelled(JNIEnv * env, char *details) { - jxbt_throw_by_name(env, "org/simgrid/msg/TaskCancelledException", details); - } diff --git a/src/bindings/java/jxbt_utilities.h b/src/bindings/java/jxbt_utilities.h index 972c112f26..2218349b0a 100644 --- a/src/bindings/java/jxbt_utilities.h +++ b/src/bindings/java/jxbt_utilities.h @@ -12,48 +12,28 @@ #include #include -/* *********** */ -/* JNI GETTERS */ -/* *********** */ - SG_BEGIN_DECL() /* Search a class and throw an exception if not found */ jclass jxbt_get_class(JNIEnv * env, const char *name); -/* Search a method in a class and throw an exception if not found - (it's ok to to pass a NULL class: it's a noop) */ -jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, - const char *name, const char *signature); +/* Search a method in a class and throw an exception if not found(it's ok to to pass a NULL class: it's a noop) */ +jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature); /* Like the jxbt_get_class() but get a static method */ -jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, - const char *name, const char *signature); - -/* Search a field in a class and throw an exception if not found - (it's ok to to pass a NULL class: it's a noop) */ -jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, - const char *name, const char *signature); +jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, const char *signature); +/* Search a field in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */ +jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char *signature); -/* Search a method in a class and throw an exception if not found - (it's ok to to pass a NULL class: it's a noop) */ -jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, - const char *name, const char *signature); +/* Search a method in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */ +jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature); /* Like the jxbt_get_smethod() but get a static method */ -jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, - const char *name, const char *signature); - -/* Search a field in a class and throw an exception if not found - (it's ok to to pass a NULL class: it's a noop) */ -jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, - const char *name, const char *signature); +jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, const char *name, const char *signature); - -/* ***************** */ -/* EXCEPTION RAISING */ -/* ***************** */ +/* Search a field in a class and throw an exception if not found (it's ok to to pass a NULL class: it's a noop) */ +jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, const char *name, const char *signature); #define jxbt_check_res(fun, res, allowed_exceptions, detail) do {\ if (res != MSG_OK && (res | allowed_exceptions)) { \ @@ -74,10 +54,8 @@ void jxbt_throw_by_name(JNIEnv * env, const char *name, char *msg); void jxbt_throw_jni(JNIEnv * env, const char *msg); /** Thrown when using an object not bound to a native one where it should, or reverse (kinda JNI issue) */ void jxbt_throw_notbound(JNIEnv * env, const char *kind, void *pointer); - /** Thrown on error in native MSG code */ void jxbt_throw_native(JNIEnv * env, char *msg); - /** Thrown if NULL gets used */ void jxbt_throw_null(JNIEnv * env, char *msg); @@ -97,6 +75,7 @@ void jxbt_throw_time_out_failure(JNIEnv * env, char *details); void jxbt_throw_task_cancelled(JNIEnv * env, char *details); /** Thrown when looking for a storage from name does not lead to anything */ void jxbt_throw_storage_not_found(JNIEnv * env, const char *invalid_name); -#endif /* ! JXBT_UTILITY_H */ SG_END_DECL() +#endif /* ! JXBT_UTILITY_H */ + -- 2.20.1