-/* 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-2017. 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 "jxbt_utilities.hpp"
+#include "jmsg.hpp"
#include <simgrid/msg.h>
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+#include <string>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java);
+
+extern "C" {
static jfieldID jcomm_field_Comm_bind;
static jfieldID jcomm_field_Comm_finished;
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) {
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;
}
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;
}
env->SetBooleanField(jcomm, jcomm_field_Comm_finished, JNI_TRUE);
if (status == MSG_OK) {
jcomm_bind_task(env,jcomm);
- return;
} else {
jmsg_throw_status(env,status);
}
}
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAll(JNIEnv *env, jclass cls, jobjectArray jcomms, jdouble timeout)
+static msg_comm_t* jarray_to_commArray(JNIEnv *env, jobjectArray jcomms, /* OUT */ int *count)
{
- int count = env->GetArrayLength(jcomms);
- msg_comm_t* comms = xbt_new(msg_comm_t, count);
+ *count = env->GetArrayLength(jcomms);
+ msg_comm_t* comms = xbt_new(msg_comm_t, *count);
- for (int i=0; i < count; i++) {
+ 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 (!comms[i]) {
- jxbt_throw_native(env,bprintf("comm at rank %d is null",i));
- return;
+ 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<double>(timeout));
xbt_free(comms);
}
-/*
-JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAny(JNIEnv *env, jobject jcomm, jarray 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<count; i++) {
+ xbt_dynar_push(dyn, &(comms[i]));
+ }
+ int rank = MSG_comm_waitany(dyn);
+ xbt_free(comms);
+ xbt_dynar_free(&dyn);
+ return rank;
+}
}
-*/