X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b87fc0829538ec066fd077e6c30ee6270b8abd78..b9625f82f86db0674e911887addce45dca31b57f:/src/bindings/java/jmsg_task.cpp diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index eb5ca2ddb6..41f53c2c47 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -1,22 +1,22 @@ /* Functions related to the java task instances. */ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved. */ /* 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 "simgrid/Exception.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/kernel/context/Context.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() - static jmethodID jtask_method_Comm_constructor; static jfieldID jtask_field_Task_bind; @@ -61,7 +61,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_create(JNIEnv * env, jobject jt if (jname) name = env->GetStringUTFChars(jname, 0); - msg_task_t task = MSG_task_create(name, static_cast(jflopsAmount), static_cast(jbytesAmount), jtask); + msg_task_t task = MSG_task_create(name, jflopsAmount, jbytesAmount, jtask); if (jname) env->ReleaseStringUTFChars(jname, name); @@ -73,11 +73,11 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jo jobjectArray jhosts, jdoubleArray jcomputeDurations_arg, jdoubleArray jmessageSizes_arg) { - int host_count = static_cast(env->GetArrayLength(jhosts)); + int host_count = 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,6 +99,10 @@ 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) @@ -124,7 +128,10 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject j return; } msg_error_t rv; - rv = MSG_task_execute(task); + if (not simgrid::ForcefulKillException::try_n_catch([&rv, &task]() { rv = MSG_task_execute(task); })) { + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); + } + if (env->ExceptionOccurred()) return; if (rv != MSG_OK) { @@ -144,7 +151,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); + const_msg_task_t task = jtask_to_native(jtask, env); if (not task) { jxbt_throw_notbound(env, "task", jtask); @@ -155,16 +162,14 @@ JNIEXPORT jstring JNICALL Java_org_simgrid_msg_Task_getName(JNIEnv * env, jobjec } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobject jtask) { - msg_process_t process; - - msg_task_t task = jtask_to_native(jtask, env); + const_msg_task_t task = jtask_to_native(jtask, env); if (not task) { jxbt_throw_notbound(env, "task", jtask); return nullptr; } - process = MSG_task_get_sender(task); + auto const* process = MSG_task_get_sender(task); if (process == nullptr) { return nullptr; } @@ -173,15 +178,14 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobj JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobject jtask) { - msg_host_t host; - msg_task_t task = jtask_to_native(jtask, env); + const_msg_task_t task = jtask_to_native(jtask, env); if (not task) { jxbt_throw_notbound(env, "task", jtask); return nullptr; } - host = MSG_task_get_source(task); + auto const* host = MSG_task_get_source(task); if (host == nullptr) { return nullptr; } @@ -195,13 +199,13 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobj JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, jobject jtask) { - msg_task_t ptask = jtask_to_native(jtask, env); + const_msg_task_t ptask = jtask_to_native(jtask, env); if (not ptask) { jxbt_throw_notbound(env, "task", jtask); return -1; } - return (jdouble) MSG_task_get_flops_amount(ptask); + return (jdouble)MSG_task_get_flops_amount(ptask); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) { @@ -227,7 +231,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, jobje jxbt_throw_notbound(env, "task", jtask); return; } - MSG_task_set_priority(task, static_cast(priority)); + MSG_task_set_priority(task, priority); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setFlopsAmount (JNIEnv *env, jobject jtask, jdouble computationAmount) @@ -238,7 +242,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setFlopsAmount (JNIEnv *env, jo jxbt_throw_notbound(env, "task", jtask); return; } - MSG_task_set_flops_amount(task, static_cast(computationAmount)); + MSG_task_set_flops_amount(task, computationAmount); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBytesAmount (JNIEnv *env, jobject jtask, jdouble dataSize) @@ -250,7 +254,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBytesAmount (JNIEnv *env, jo return; } env->SetDoubleField(jtask, jtask_field_Task_messageSize, dataSize); - MSG_task_set_bytes_amount(task, static_cast(dataSize)); + MSG_task_set_bytes_amount(task, dataSize); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobject jtask, jstring jalias, @@ -266,8 +270,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobjec 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_bounded(task, alias, static_cast(jtimeout), static_cast(maxrate)); + msg_error_t res = MSG_task_send_with_timeout_bounded(task, alias, jtimeout, maxrate); env->ReleaseStringUTFChars(jalias, alias); if (res != MSG_OK) @@ -279,12 +282,16 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv* env, jclass msg_task_t task = nullptr; const char *alias = env->GetStringUTFChars(jalias, 0); - msg_error_t rv = MSG_task_receive_ext(&task, alias, (double)jtimeout, /*host*/ nullptr); + msg_error_t rv; + if (not simgrid::ForcefulKillException::try_n_catch( + [&rv, &task, &alias, &jtimeout]() { rv = MSG_task_receive_with_timeout(&task, alias, (double)jtimeout); })) { + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", "Process killed"); + } env->ReleaseStringUTFChars(jalias, alias); if (env->ExceptionOccurred()) return nullptr; if (rv != MSG_OK) { - jmsg_throw_status(env,rv); + jmsg_throw_status(env, rv); return nullptr; } jobject jtask_global = (jobject) MSG_task_get_data(task); @@ -303,8 +310,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass c 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); @@ -330,8 +336,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv* env, msg_task_t task = nullptr; const char *alias = env->GetStringUTFChars(jalias, 0); - msg_error_t res = MSG_task_receive_ext_bounded(&task, alias, static_cast(jtimeout), /*host*/ nullptr, - static_cast(rate)); + msg_error_t res = MSG_task_receive_with_timeout_bounded(&task, alias, jtimeout, rate); if (env->ExceptionOccurred()) return nullptr; if (res != MSG_OK) { @@ -358,7 +363,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, j 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 (not jcomm) { @@ -367,7 +372,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, j } const char* mailbox = env->GetStringUTFChars(jmailbox, 0); - msg_comm_t comm = MSG_task_irecv_bounded(task, mailbox, static_cast(rate)); + msg_comm_t comm = MSG_task_irecv_bounded(task, mailbox, rate); env->ReleaseStringUTFChars(jmailbox, mailbox); env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); @@ -460,13 +465,17 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeFinalize(JNIEnv * env, jo static void msg_task_cancel_on_failed_dsend(void*t) { msg_task_t task = (msg_task_t) t; - JNIEnv *env =get_current_thread_env(); - jobject jtask_global = (jobject) MSG_task_get_data(task); - - /* Destroy the global ref so that the JVM can free the stuff */ - env->DeleteGlobalRef(jtask_global); + JNIEnv* env = get_current_thread_env(); + if (env) { + jobject jtask_global = (jobject)MSG_task_get_data(task); + /* Destroy the global ref so that the JVM can free the stuff */ + env->DeleteGlobalRef(jtask_global); + /* Don't free the C data here, to avoid a race condition with the GC also sometimes doing so. + * A rare memleak is seen as preferable to a rare "free(): invalid pointer" failure that + * proves really hard to debug. + */ + } 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) @@ -503,7 +512,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobj /* Pass a global ref to the Jtask into the Ctask so that the receiver can use it */ MSG_task_set_data(task, (void *) env->NewGlobalRef(jtask)); - MSG_task_dsend_bounded(task, alias, msg_task_cancel_on_failed_dsend,static_cast(maxrate)); + MSG_task_dsend_bounded(task, alias, msg_task_cancel_on_failed_dsend, maxrate); env->ReleaseStringUTFChars(jalias, alias); } @@ -525,5 +534,3 @@ JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass return (jint) rv; } - -SG_END_DECL()