X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff44f283112e6d05575f5e243080f27d395140d8..d46985afb9ccf877e2a379684bf56104e8008740:/src/bindings/java/jmsg_task.cpp diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index f51a8f4e7c..8fcb172631 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -5,17 +5,17 @@ /* 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 +#include "simgrid/s4u/Host.hpp" -#include "jmsg.h" +#include "jmsg.hpp" #include "jmsg_host.h" -#include "jmsg_task.h" #include "jmsg_process.h" -#include "jxbt_utilities.h" +#include "jmsg_task.h" +#include "jxbt_utilities.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); -SG_BEGIN_DECL() +extern "C" { static jmethodID jtask_method_Comm_constructor; @@ -76,8 +76,8 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jo int host_count = static_cast(env->GetArrayLength(jhosts)); jdouble* jcomputeDurations = env->GetDoubleArrayElements(jcomputeDurations_arg, 0); - msg_host_t* hosts = xbt_new0(msg_host_t, host_count); - double* computeDurations = xbt_new0(double, host_count); + msg_host_t* hosts = new msg_host_t[host_count]; + double* computeDurations = new double[host_count]; for (int index = 0; index < host_count; index++) { jobject jhost = env->GetObjectArrayElement(jhosts, index); hosts[index] = jhost_get_native(env, jhost); @@ -86,7 +86,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jo env->ReleaseDoubleArrayElements(jcomputeDurations_arg, jcomputeDurations, 0); jdouble* jmessageSizes = env->GetDoubleArrayElements(jmessageSizes_arg, 0); - double* messageSizes = xbt_new0(double, host_count* host_count); + double* messageSizes = new double[host_count * host_count]; for (int index = 0; index < host_count * host_count; index++) { messageSizes[index] = jmessageSizes[index]; } @@ -99,27 +99,31 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jo /* associate the java task object and the native task */ jtask_bind(jtask, task, env); + + delete[] hosts; + delete[] computeDurations; + delete[] messageSizes; } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel(JNIEnv * env, jobject jtask) { msg_task_t ptask = jtask_to_native(jtask, env); - if (!ptask) { + if (not ptask) { jxbt_throw_notbound(env, "task", jtask); return; } 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, "unexpected error , please report this bug"); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask) { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -136,7 +140,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -146,7 +150,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName(JNIEnv * env, jobject jtask) { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return nullptr; } @@ -159,7 +163,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobj msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return nullptr; } @@ -176,7 +180,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobj msg_host_t host; msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return nullptr; } @@ -185,7 +189,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobj if (host == nullptr) { return nullptr; } - if (!host->extension(JAVA_HOST_LEVEL)) { + if (not host->extension(JAVA_HOST_LEVEL)) { jxbt_throw_jni(env, "MSG_task_get_source() failed"); return nullptr; } @@ -197,17 +201,17 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, { msg_task_t ptask = jtask_to_native(jtask, env); - if (!ptask) { + if (not ptask) { jxbt_throw_notbound(env, "task", jtask); return -1; } - return (jdouble) MSG_task_get_flops_amount(ptask); + return (jdouble)MSG_task_get_initial_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(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -223,7 +227,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, jobje { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -234,7 +238,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setFlopsAmount (JNIEnv *env, jo { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -245,7 +249,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBytesAmount (JNIEnv *env, jo { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -253,30 +257,11 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBytesAmount (JNIEnv *env, jo MSG_task_set_bytes_amount(task, static_cast(dataSize)); } -JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask, jstring jalias, jdouble jtimeout) -{ - msg_task_t task = jtask_to_native(jtask, env); - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return; - } - - /* Add a global ref into the Ctask so that the receiver can use it */ - MSG_task_set_data(task, (void *) env->NewGlobalRef(jtask)); - - const char* alias = env->GetStringUTFChars(jalias, 0); - msg_error_t res = MSG_task_send_with_timeout(task, alias, static_cast(jtimeout)); - env->ReleaseStringUTFChars(jalias, alias); - - if (res != MSG_OK) - jmsg_throw_status(env, res); -} - JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask, jstring jalias, jdouble jtimeout,jdouble maxrate) { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -293,23 +278,12 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobjec jmsg_throw_status(env, res); } -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) { msg_task_t task = nullptr; - msg_host_t host = nullptr; - - if (jhost) { - host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return nullptr; - } - } const char *alias = env->GetStringUTFChars(jalias, 0); - msg_error_t rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host); + msg_error_t rv = MSG_task_receive_ext(&task, alias, (double)jtimeout, /*host*/ nullptr); env->ReleaseStringUTFChars(jalias, alias); if (env->ExceptionOccurred()) return nullptr; @@ -324,22 +298,20 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass env->DeleteGlobalRef(jtask_global); MSG_task_set_data(task, nullptr); - return (jobject) jtask_local; } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) { jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); - if (!comm_class) + if (not comm_class) return nullptr; //pointer to store the task object pointer. - msg_task_t *task = xbt_new(msg_task_t,1); - *task = nullptr; + msg_task_t* task = new msg_task_t(nullptr); /* There should be a cache here */ jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); - if (!jcomm) { + if (not jcomm) { jxbt_throw_jni(env, "Can't create a Comm object."); return nullptr; } @@ -355,43 +327,29 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass c 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, jdouble rate) { - msg_error_t rv; - msg_task_t *task = xbt_new(msg_task_t,1); - *task = nullptr; - - msg_host_t host = nullptr; - - if (jhost) { - host = jhost_get_native(env, jhost); - - if (!host) { - jxbt_throw_notbound(env, "host", jhost); - return nullptr; - } - } + msg_task_t task = nullptr; const char *alias = env->GetStringUTFChars(jalias, 0); - rv = MSG_task_receive_ext_bounded(task, alias, static_cast(jtimeout), host, static_cast(rate)); + msg_error_t res = MSG_task_receive_ext_bounded(&task, alias, static_cast(jtimeout), /*host*/ nullptr, + static_cast(rate)); if (env->ExceptionOccurred()) return nullptr; - if (rv != MSG_OK) { - jmsg_throw_status(env,rv); + if (res != MSG_OK) { + jmsg_throw_status(env, res); return nullptr; } - jobject jtask_global = (jobject) MSG_task_get_data(*task); + jobject jtask_global = (jobject)MSG_task_get_data(task); /* Convert the global ref into a local ref so that the JVM can free the stuff */ jobject jtask_local = env->NewLocalRef(jtask_global); env->DeleteGlobalRef(jtask_global); - MSG_task_set_data(*task, nullptr); + MSG_task_set_data(task, nullptr); env->ReleaseStringUTFChars(jalias, alias); - xbt_free(task); - return (jobject) jtask_local; } @@ -399,14 +357,14 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, j jdouble rate) { jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); - if (!comm_class) + if (not comm_class) return nullptr; // pointer to store the task object pointer. - msg_task_t* task = xbt_new0(msg_task_t, 1); + msg_task_t* task = new msg_task_t(nullptr); jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); - if (!jcomm) { + if (not jcomm) { jxbt_throw_jni(env, "Can't create a Comm object."); return nullptr; } @@ -428,14 +386,15 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject j jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); - if (!comm_class) return nullptr; + if (not comm_class) + return nullptr; jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); const char* mailbox = env->GetStringUTFChars(jmailbox, 0); msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { env->ReleaseStringUTFChars(jmailbox, mailbox); env->DeleteLocalRef(jcomm); jxbt_throw_notbound(env, "task", jtask); @@ -463,7 +422,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jo const char *mailbox; jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); - if (!comm_class) + if (not comm_class) return nullptr; jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); @@ -471,7 +430,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jo task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { env->ReleaseStringUTFChars(jmailbox, mailbox); env->DeleteLocalRef(jcomm); jxbt_throw_notbound(env, "task", jtask); @@ -494,7 +453,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeFinalize(JNIEnv * env, jo { msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { jxbt_throw_notbound(env, "task", jtask); return; } @@ -519,7 +478,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jta msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { env->ReleaseStringUTFChars(jalias, alias); jxbt_throw_notbound(env, "task", jtask); return; @@ -539,7 +498,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobj msg_task_t task = jtask_to_native(jtask, env); - if (!task) { + if (not task) { env->ReleaseStringUTFChars(jalias, alias); jxbt_throw_notbound(env, "task", jtask); return; @@ -569,5 +528,4 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass return (jint) rv; } - -SG_END_DECL() +}