X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..dccf1b41e9c7b5a696f01abceaa2779fe65f154f:/src/bindings/java/jmsg_task.cpp diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index 7940f7ae35..f298008066 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -6,19 +6,21 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "jmsg.h" +#include +#include +#include + +#include +#include +#include "jmsg.h" #include "jmsg_host.h" #include "jmsg_task.h" - +#include "jmsg_process.h" #include "jxbt_utilities.h" -#include - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); -jobject native_to_java_process(msg_process_t process); - static jmethodID jtask_method_Comm_constructor; static jfieldID jtask_field_Task_bind; @@ -43,8 +45,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"); @@ -61,27 +62,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 */ + const char *name = nullptr; /* 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; } @@ -91,9 +84,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, nullptr); if (jname) env->ReleaseStringUTFChars(jname, name); /* sets the task name */ @@ -103,16 +94,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; @@ -121,21 +106,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; } @@ -146,15 +126,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); @@ -165,16 +142,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, nullptr); env->ReleaseStringUTFChars(jname, name); /* sets the task name */ @@ -188,9 +162,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); @@ -201,12 +173,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); @@ -223,8 +193,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 load) +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); @@ -232,67 +201,60 @@ Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble load) jxbt_throw_notbound(env, "task", jtask); return; } - MSG_task_set_bound(task, load); + 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) { jxbt_throw_notbound(env, "task", jtask); - return NULL; + return nullptr; } 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); if (!task) { jxbt_throw_notbound(env, "task", jtask); - return NULL; + return nullptr; } process = MSG_task_get_sender(task); - if (process == NULL) { - return NULL; + if (process == nullptr) { + return nullptr; } 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); if (!task) { jxbt_throw_notbound(env, "task", jtask); - return NULL; + return nullptr; } host = MSG_task_get_source(task); - if (host == NULL) { - return NULL; + if (host == nullptr) { + return nullptr; } - if (!xbt_lib_get_level(host, JAVA_HOST_LEVEL)) { + if (!host->extension(JAVA_HOST_LEVEL)) { jxbt_throw_jni(env, "MSG_task_get_source() failed"); - return NULL; + return nullptr; } - return (jobject) xbt_lib_get_level(host, JAVA_HOST_LEVEL); + 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); @@ -303,24 +265,22 @@ 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) { - msg_task_t task = jtask_to_native_task(jtask, env); +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) { - jxbt_throw_notbound(env, "task", jtask); - return; - } - const char *name = env->GetStringUTFChars((jstring) jname, 0); + if (!task) { + jxbt_throw_notbound(env, "task", jtask); + return; + } + const char *name = env->GetStringUTFChars((jstring) jname, 0); - env->SetObjectField(jtask, jtask_field_Task_name, jname); - MSG_task_set_name(task, name); + env->SetObjectField(jtask, jtask_field_Task_name, jname); + MSG_task_set_name(task, name); - env->ReleaseStringUTFChars((jstring) jname, name); + 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); @@ -330,41 +290,37 @@ 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) { - msg_task_t task = jtask_to_native_task(jtask, env); - if (!task) { +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) { jxbt_throw_notbound(env, "task", jtask); return; - } - MSG_task_set_flops_amount(task, (double) computationAmount); + } + MSG_task_set_flops_amount(task, (double) computationAmount); } -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) { +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) { jxbt_throw_notbound(env, "task", jtask); return; - } + } env->SetDoubleField(jtask, jtask_field_Task_messageSize, dataSize); - MSG_task_set_bytes_amount(task, (double) dataSize); + 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); @@ -381,18 +337,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); @@ -409,97 +361,85 @@ 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); - *task = NULL; + msg_task_t task = nullptr; - msg_host_t host = NULL; + msg_host_t host = nullptr; jobject jtask_global, jtask_local; - const char *alias; if (jhost) { host = jhost_get_native(env, jhost); if (!host) { jxbt_throw_notbound(env, "host", jhost); - return NULL; + return nullptr; } } - alias = env->GetStringUTFChars(jalias, 0); - rv = MSG_task_receive_ext(task, alias, (double) jtimeout, host); + const char *alias = env->GetStringUTFChars(jalias, 0); + msg_error_t rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host); if (env->ExceptionOccurred()) - return NULL; + return nullptr; if (rv != MSG_OK) { jmsg_throw_status(env,rv); - return NULL; + return nullptr; } - jtask_global = (jobject) MSG_task_get_data(*task); + jtask_global = (jobject) MSG_task_get_data(task); /* Convert the global ref into a local ref so that the JVM can free the stuff */ jtask_local = env->NewLocalRef(jtask_global); env->DeleteGlobalRef(jtask_global); - MSG_task_set_data(*task, NULL); + MSG_task_set_data(task, nullptr); env->ReleaseStringUTFChars(jalias, alias); - xbt_free(task); - return (jobject) jtask_local; } +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; + //pointer to store the task object pointer. + msg_task_t *task = xbt_new(msg_task_t,1); + *task = nullptr; + /* There should be a cache here */ + comm_class = env->FindClass("org/simgrid/msg/Comm"); -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; - //pointer to store the task object pointer. - msg_task_t *task = xbt_new(msg_task_t,1); - *task = NULL; - /* There should be a cache here */ - comm_class = env->FindClass("org/simgrid/msg/Comm"); - - if (!comm_class) { - jxbt_throw_native(env,bprintf("fieldID or methodID or class not found.")); - return NULL; - } + if (!comm_class) { + jxbt_throw_native(env,bprintf("fieldID or methodID or class not found.")); + return nullptr; + } - jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); - if (!jcomm) { - jxbt_throw_native(env,bprintf("Can't create a Comm object.")); - return NULL; - } + jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); + if (!jcomm) { + jxbt_throw_native(env,bprintf("Can't create a Comm object.")); + return nullptr; + } - mailbox = env->GetStringUTFChars(jmailbox, 0); + mailbox = env->GetStringUTFChars(jmailbox, 0); - comm = MSG_task_irecv(task,mailbox); + comm = MSG_task_irecv(task,mailbox); - env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); - env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(task)); - env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_TRUE); + env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); + env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(task)); + env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_TRUE); - env->ReleaseStringUTFChars(jmailbox, mailbox); + env->ReleaseStringUTFChars(jmailbox, mailbox); - return jcomm; + 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); - *task = NULL; + *task = nullptr; - msg_host_t host = NULL; + msg_host_t host = nullptr; jobject jtask_global, jtask_local; const char *alias; @@ -508,24 +448,24 @@ Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, jclass cls, if (!host) { jxbt_throw_notbound(env, "host", jhost); - return NULL; + return nullptr; } } alias = env->GetStringUTFChars(jalias, 0); rv = MSG_task_receive_ext_bounded(task, alias, (double) jtimeout, host, (double) rate); if (env->ExceptionOccurred()) - return NULL; + return nullptr; if (rv != MSG_OK) { jmsg_throw_status(env,rv); - return NULL; + return nullptr; } jtask_global = (jobject) MSG_task_get_data(*task); /* Convert the global ref into a local ref so that the JVM can free the stuff */ jtask_local = env->NewLocalRef(jtask_global); env->DeleteGlobalRef(jtask_global); - MSG_task_set_data(*task, NULL); + MSG_task_set_data(*task, nullptr); env->ReleaseStringUTFChars(jalias, alias); @@ -534,57 +474,53 @@ 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) +{ + msg_comm_t comm; + const char *mailbox; + jclass comm_class; + //pointer to store the task object pointer. + msg_task_t *task = xbt_new(msg_task_t,1); + *task = nullptr; + /* There should be a cac hee */ + comm_class = env->FindClass("org/simgrid/msg/Comm"); -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; - //pointer to store the task object pointer. - msg_task_t *task = xbt_new(msg_task_t,1); - *task = NULL; - /* There should be a cac hee */ - comm_class = env->FindClass("org/simgrid/msg/Comm"); - - if (!comm_class) { - jxbt_throw_native(env,bprintf("fieldID or methodID or class not found.")); - return NULL; - } + if (!comm_class) { + jxbt_throw_native(env,bprintf("fieldID or methodID or class not found.")); + return nullptr; + } - jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); - if (!jcomm) { - jxbt_throw_native(env,bprintf("Can't create a Comm object.")); - return NULL; - } + jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); + if (!jcomm) { + jxbt_throw_native(env,bprintf("Can't create a Comm object.")); + return nullptr; + } - mailbox = env->GetStringUTFChars(jmailbox, 0); + mailbox = env->GetStringUTFChars(jmailbox, 0); - comm = MSG_task_irecv_bounded(task,mailbox, (double) rate); + comm = MSG_task_irecv_bounded(task,mailbox, (double) rate); - env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); - env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(task)); - env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_TRUE); + env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); + env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(task)); + env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_TRUE); - env->ReleaseStringUTFChars(jmailbox, mailbox); + env->ReleaseStringUTFChars(jmailbox, mailbox); - return jcomm; + 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"); - if (!comm_class) return NULL; + if (!comm_class) return nullptr; jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); mailbox = env->GetStringUTFChars(jmailbox, 0); @@ -595,14 +531,14 @@ Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) { env->ReleaseStringUTFChars(jmailbox, mailbox); env->DeleteLocalRef(jcomm); jxbt_throw_notbound(env, "task", jtask); - return NULL; + return nullptr; } -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)); - env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(NULL)); + env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(nullptr)); env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_FALSE); env->ReleaseStringUTFChars(jmailbox, mailbox); @@ -610,20 +546,18 @@ 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"); - if (!comm_class) return NULL; + if (!comm_class) return nullptr; jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); mailbox = env->GetStringUTFChars(jmailbox, 0); @@ -634,14 +568,14 @@ Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmail env->ReleaseStringUTFChars(jmailbox, mailbox); env->DeleteLocalRef(jcomm); jxbt_throw_notbound(env, "task", jtask); - return NULL; + return nullptr; } MSG_task_set_data(task, (void *) env->NewGlobalRef(jtask)); comm = MSG_task_isend_bounded(task,mailbox,maxrate); env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); - env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(NULL)); + env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(nullptr)); env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_FALSE); env->ReleaseStringUTFChars(jmailbox, mailbox); @@ -649,16 +583,16 @@ 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) { - msg_task_t task = jtask_to_native_task(jtask, env); +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) { - jxbt_throw_notbound(env, "task", jtask); - return; - } + if (!task) { + jxbt_throw_notbound(env, "task", jtask); + return; + } - MSG_task_destroy(task); + MSG_task_destroy(task); } static void msg_task_cancel_on_failed_dsend(void*t) { @@ -668,18 +602,16 @@ static void msg_task_cancel_on_failed_dsend(void*t) { /* Destroy the global ref so that the JVM can free the stuff */ env->DeleteGlobalRef(jtask_global); - MSG_task_set_data(task, NULL); + MSG_task_set_data(task, nullptr); 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); @@ -693,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); @@ -714,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; @@ -729,28 +657,7 @@ 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) - { - int rv; - const char *alias; - - msg_host_t host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return -1; - } - alias = env->GetStringUTFChars(jalias, 0); - rv = MSG_task_listen_from_host(alias, host); - env->ReleaseStringUTFChars(jalias, alias); - - 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);