X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7f817f1d9a3b1572b38300d6a7eeadfbcc1ad1f..3549ebd27861c2514a3f697a128fa05b5ca685e2:/src/bindings/java/jmsg_comm.cpp diff --git a/src/bindings/java/jmsg_comm.cpp b/src/bindings/java/jmsg_comm.cpp index 320b159fae..47f14d60a6 100644 --- a/src/bindings/java/jmsg_comm.cpp +++ b/src/bindings/java/jmsg_comm.cpp @@ -10,6 +10,8 @@ #include "jmsg.h" #include +#include + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); SG_BEGIN_DECL() @@ -78,8 +80,8 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject j return JNI_TRUE; } - if (!comm) { - jxbt_throw_null(env, bprintf("comm is null")); + if (not comm) { + jxbt_throw_null(env, "comm is null"); return JNI_FALSE; } @@ -98,8 +100,8 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject j 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_null(env, bprintf("comm is null")); + if (not comm) { + jxbt_throw_null(env, "comm is null"); return; } @@ -129,8 +131,8 @@ static msg_comm_t* jarray_to_commArray(JNIEnv *env, jobjectArray jcomms, /* OUT break; comms[i] = (msg_comm_t) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_bind); - if (!comms[i]) { - jxbt_throw_null(env, bprintf("comm at rank %d is null", i)); + if (not comms[i]) { + jxbt_throw_null(env, std::string("comm at rank ") + std::to_string(i) + " is null"); return nullptr; } @@ -142,7 +144,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitAll(JNIEnv *env, jclass cls { int count; msg_comm_t* comms = jarray_to_commArray(env, jcomms, &count); - if (!comms) + if (not comms) return; MSG_comm_waitall(comms, count, static_cast(timeout)); @@ -152,7 +154,7 @@ JNIEXPORT int JNICALL Java_org_simgrid_msg_Comm_waitAny(JNIEnv *env, jclass cls, { int count; msg_comm_t* comms = jarray_to_commArray(env, jcomms, &count); - if (!comms) + if (not comms) return -1; xbt_dynar_t dyn = xbt_dynar_new(sizeof(msg_comm_t),nullptr); for (int i=0; i