X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/bindings/java/jmsg_comm.cpp diff --git a/src/bindings/java/jmsg_comm.cpp b/src/bindings/java/jmsg_comm.cpp index 95fa5a2e60..513384cc62 100644 --- a/src/bindings/java/jmsg_comm.cpp +++ b/src/bindings/java/jmsg_comm.cpp @@ -1,17 +1,18 @@ -/* Functions related to the java comm instances */ +/* Java bindings to the Comm API */ -/* Copyright (c) 2012-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2012-2018. 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 "jmsg_comm.h" -#include "jxbt_utilities.h" -#include "jmsg.h" +#include "jmsg.hpp" +#include "jxbt_utilities.hpp" #include -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); +#include + +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); static jfieldID jcomm_field_Comm_bind; static jfieldID jcomm_field_Comm_finished; @@ -26,10 +27,10 @@ void jcomm_bind_task(JNIEnv *env, jobject jcomm) { if (jreceiving == JNI_TRUE) { //bind the task object. msg_task_t task = MSG_comm_get_task(comm); - xbt_assert(task != NULL, "Task is NULL"); - jobject jtask_global = (jobject) MSG_task_get_data(task); + xbt_assert(task != nullptr, "Task is nullptr"); + jobject jtask_global = static_cast(MSG_task_get_data(task)); //case where the data has already been retrieved - if (jtask_global == NULL) { + if (jtask_global == nullptr) { return; } @@ -39,42 +40,36 @@ void jcomm_bind_task(JNIEnv *env, jobject jcomm) { env->SetObjectField(jcomm, jtask_field_Comm_task, jtask_local); - MSG_task_set_data(task, NULL); + MSG_task_set_data(task, nullptr); } - } -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.")); - return; - } + xbt_assert(jfield_class_Comm, "Native initialization of msg/Comm failed. Please report that bug"); + jcomm_field_Comm_bind = jxbt_get_jfield(env, jfield_class_Comm, "bind", "J"); jcomm_field_Comm_taskBind = jxbt_get_jfield(env, jfield_class_Comm, "taskBind", "J"); 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) { - jxbt_throw_native(env,bprintf("Can't find some fields in Java class.")); - } + xbt_assert(jcomm_field_Comm_bind && jcomm_field_Comm_taskBind && jcomm_field_Comm_receiving && + jtask_field_Comm_task && jcomm_field_Comm_finished, + "Native initialization of msg/Comm failed. Please report that bug"); } -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; task_received = (msg_task_t*) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_taskBind); - xbt_free(task_received); + delete task_received; comm = (msg_comm_t) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_bind); 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); @@ -83,8 +78,8 @@ Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject jcomm) { return JNI_TRUE; } - if (!comm) { - jxbt_throw_native(env,bprintf("comm is null")); + if (not comm) { + jxbt_throw_null(env, "comm is null"); return JNI_FALSE; } @@ -100,11 +95,11 @@ 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")); + if (not comm) { + jxbt_throw_null(env, "comm is null"); return; } @@ -114,14 +109,58 @@ Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble tim } msg_error_t status; - status = MSG_comm_wait(comm,(double)timeout); + status = MSG_comm_wait(comm,static_cast(timeout)); env->SetBooleanField(jcomm, jcomm_field_Comm_finished, JNI_TRUE); if (status == MSG_OK) { jcomm_bind_task(env,jcomm); - return; - } - else { + } else { jmsg_throw_status(env,status); } +} + +static msg_comm_t* jarray_to_commArray(JNIEnv *env, jobjectArray jcomms, /* OUT */ int *count) +{ + *count = env->GetArrayLength(jcomms); + msg_comm_t* comms = new msg_comm_t[*count]; + + for (int i=0; i < *count; i++) { + jobject jcomm = env->GetObjectArrayElement(jcomms, i); + if (env->ExceptionOccurred()) + break; + + comms[i] = (msg_comm_t) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_bind); + if (not comms[i]) { + jxbt_throw_null(env, std::string("comm at rank ") + std::to_string(i) + " is null"); + return nullptr; + } + + env->DeleteLocalRef(jcomm); // reduce the load on the garbage collector: we don't need that object anymore + } + return comms; +} +JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAll(JNIEnv *env, jclass cls, jobjectArray jcomms, jdouble timeout) +{ + int count; + msg_comm_t* comms = jarray_to_commArray(env, jcomms, &count); + if (not comms) + return; + + MSG_comm_waitall(comms, count, static_cast(timeout)); + delete[] comms; +} +JNIEXPORT int JNICALL Java_org_simgrid_msg_Comm_waitAny(JNIEnv *env, jclass cls, jobjectArray jcomms) +{ + int count; + msg_comm_t* comms = jarray_to_commArray(env, jcomms, &count); + if (not comms) + return -1; + xbt_dynar_t dyn = xbt_dynar_new(sizeof(msg_comm_t),nullptr); + for (int i=0; i