X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5cf915bd09762c921e587f376420993f216a239..3f8dfa54581750e47851e7502d180425c6a65d48:/src/bindings/java/jmsg_task.cpp diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index a7d55458a0..f0da73932b 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -1,21 +1,22 @@ /* Functions related to the java task instances. */ -/* Copyright (c) 2007, 2009-2010, 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-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 + #include "jmsg.h" #include "jmsg_host.h" #include "jmsg_task.h" #include "jmsg_process.h" #include "jxbt_utilities.h" -#include - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); +SG_BEGIN_DECL() + static jmethodID jtask_method_Comm_constructor; static jfieldID jtask_field_Task_bind; @@ -30,19 +31,16 @@ void jtask_bind(jobject jtask, msg_task_t task, JNIEnv * env) env->SetLongField(jtask, jtask_field_Task_bind, (intptr_t)task); } -msg_task_t jtask_to_native_task(jobject jtask, JNIEnv * env) +msg_task_t jtask_to_native(jobject jtask, JNIEnv* env) { return (msg_task_t)(intptr_t)env->GetLongField(jtask, jtask_field_Task_bind); } -jboolean jtask_is_valid(jobject jtask, JNIEnv * env) -{ - return env->GetLongField(jtask, jtask_field_Task_bind) ? JNI_TRUE : JNI_FALSE; -} - JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) { jclass jtask_class_Comm = env->FindClass("org/simgrid/msg/Comm"); jclass jtask_class_Task = env->FindClass("org/simgrid/msg/Task"); + xbt_assert(jtask_class_Comm && jtask_class_Task, + "Native initialization of msg/Comm or msg/Task failed. Please report that bug"); jtask_method_Comm_constructor = env->GetMethodID(jtask_class_Comm, "", "()V"); jtask_field_Task_bind = jxbt_get_jfield(env, jtask_class_Task, "bind", "J"); @@ -51,10 +49,9 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass jtask_field_Comm_bind = jxbt_get_jfield(env, jtask_class_Comm, "bind", "J"); jtask_field_Comm_taskBind = jxbt_get_jfield(env, jtask_class_Comm, "taskBind", "J"); jtask_field_Comm_receiving = jxbt_get_jfield(env, jtask_class_Comm, "receiving", "Z"); - if (!jtask_field_Task_bind || !jtask_class_Task || !jtask_field_Comm_bind || !jtask_field_Comm_taskBind || - !jtask_field_Comm_receiving || !jtask_method_Comm_constructor) { - jxbt_throw_native(env,bprintf("Can't find some fields in Java class.")); - } + xbt_assert(jtask_field_Task_bind && jtask_field_Comm_bind && jtask_field_Comm_taskBind && + jtask_field_Comm_receiving && jtask_method_Comm_constructor, + "Native initialization of msg/Task failed. Please report that bug"); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_create(JNIEnv * env, jobject jtask, jstring jname, @@ -64,12 +61,12 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_create(JNIEnv * env, jobject jt const char *name = nullptr; /* the name of the task */ if (jflopsAmount < 0) { - jxbt_throw_illegal(env, bprintf("Task flopsAmount (%f) cannot be negative", (double) jflopsAmount)); + jxbt_throw_illegal(env, bprintf("Task flopsAmount (%f) cannot be negative", static_cast(jflopsAmount))); return; } if (jbytesAmount < 0) { - jxbt_throw_illegal(env, bprintf("Task bytesAmount (%f) cannot be negative", (double) jbytesAmount)); + jxbt_throw_illegal(env, bprintf("Task bytesAmount (%f) cannot be negative", static_cast(jbytesAmount))); return; } @@ -79,7 +76,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_create(JNIEnv * env, jobject jt } /* create the task */ - task = MSG_task_create(name, (double) jflopsAmount, (double) jbytesAmount, nullptr); + task = MSG_task_create(name, static_cast(jflopsAmount), static_cast(jbytesAmount), nullptr); if (jname) env->ReleaseStringUTFChars(jname, name); /* sets the task name */ @@ -119,7 +116,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jo return; } - host_count = (int) env->GetArrayLength(jhosts); + host_count = static_cast(env->GetArrayLength(jhosts)); hosts = xbt_new0(msg_host_t, host_count); computeDurations = xbt_new0(double, host_count); @@ -159,7 +156,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jo JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel(JNIEnv * env, jobject jtask) { - msg_task_t ptask = jtask_to_native_task(jtask, env); + msg_task_t ptask = jtask_to_native(jtask, env); if (!ptask) { jxbt_throw_notbound(env, "task", jtask); @@ -173,7 +170,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_cancel(JNIEnv * env, jobject jt JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject jtask) { - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); @@ -190,7 +187,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_execute(JNIEnv * env, jobject j JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBound(JNIEnv * env, jobject jtask, jdouble bound) { - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); @@ -200,7 +197,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_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); @@ -213,7 +210,7 @@ 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_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); @@ -224,13 +221,13 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobj if (process == nullptr) { return nullptr; } - return (jobject) native_to_java_process(process); + return (jobject)jprocess_from_native(process); } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobject jtask) { msg_host_t host; - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); @@ -251,7 +248,7 @@ 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_task(jtask, env); + msg_task_t ptask = jtask_to_native(jtask, env); if (!ptask) { jxbt_throw_notbound(env, "task", jtask); @@ -261,7 +258,7 @@ JNIEXPORT jdouble JNICALL Java_org_simgrid_msg_Task_getFlopsAmount(JNIEnv * env, } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) { - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); @@ -277,36 +274,36 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jt JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, jobject jtask, jdouble priority) { - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); return; } - MSG_task_set_priority(task, (double) priority); + MSG_task_set_priority(task, static_cast(priority)); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setFlopsAmount (JNIEnv *env, jobject jtask, jdouble computationAmount) { - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); return; } - MSG_task_set_flops_amount(task, (double) computationAmount); + MSG_task_set_flops_amount(task, static_cast(computationAmount)); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setBytesAmount (JNIEnv *env, jobject jtask, jdouble dataSize) { - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { jxbt_throw_notbound(env, "task", jtask); return; } env->SetDoubleField(jtask, jtask_field_Task_messageSize, dataSize); - MSG_task_set_bytes_amount(task, (double) dataSize); + 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) @@ -314,7 +311,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask msg_error_t rv; const char *alias = env->GetStringUTFChars(jalias, 0); - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { env->ReleaseStringUTFChars(jalias, alias); @@ -324,7 +321,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask /* 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)); - rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout); + rv = MSG_task_send_with_timeout(task, alias, static_cast(jtimeout)); env->ReleaseStringUTFChars(jalias, alias); if (rv != MSG_OK) { @@ -338,7 +335,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobjec msg_error_t rv; const char *alias = env->GetStringUTFChars(jalias, 0); - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { env->ReleaseStringUTFChars(jalias, alias); @@ -348,7 +345,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_sendBounded(JNIEnv * env,jobjec /* 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)); - rv = MSG_task_send_with_timeout_bounded(task, alias, (double) jtimeout, (double) maxrate); + rv = MSG_task_send_with_timeout_bounded(task, alias, static_cast(jtimeout), static_cast(maxrate)); env->ReleaseStringUTFChars(jalias, alias); if (rv != MSG_OK) { @@ -360,9 +357,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass jobject jhost) { msg_task_t task = nullptr; - msg_host_t host = nullptr; - jobject jtask_global, jtask_local; if (jhost) { host = jhost_get_native(env, jhost); @@ -381,10 +376,10 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass jmsg_throw_status(env,rv); return nullptr; } - 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 */ - jtask_local = env->NewLocalRef(jtask_global); + jobject jtask_local = env->NewLocalRef(jtask_global); env->DeleteGlobalRef(jtask_global); MSG_task_set_data(task, nullptr); @@ -394,36 +389,29 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) { - msg_comm_t comm; - const char *mailbox; - jclass comm_class; + jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); + if (!comm_class) + return nullptr; + //pointer to store the task object pointer. msg_task_t *task = xbt_new(msg_task_t,1); *task = nullptr; /* There should be a cache here */ - comm_class = env->FindClass("org/simgrid/msg/Comm"); - - if (!comm_class) { - jxbt_throw_native(env,bprintf("fieldID or methodID or class not found.")); - return nullptr; - } jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); if (!jcomm) { - jxbt_throw_native(env,bprintf("Can't create a Comm object.")); + jxbt_throw_jni(env, "Can't create a Comm object."); return nullptr; } - mailbox = env->GetStringUTFChars(jmailbox, 0); - - comm = MSG_task_irecv(task,mailbox); + const char* mailbox = env->GetStringUTFChars(jmailbox, 0); + msg_comm_t comm = MSG_task_irecv(task, mailbox); + env->ReleaseStringUTFChars(jmailbox, mailbox); env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(task)); env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_TRUE); - env->ReleaseStringUTFChars(jmailbox, mailbox); - return jcomm; } @@ -435,8 +423,6 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, *task = nullptr; msg_host_t host = nullptr; - jobject jtask_global, jtask_local; - const char *alias; if (jhost) { host = jhost_get_native(env, jhost); @@ -447,18 +433,18 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, } } - alias = env->GetStringUTFChars(jalias, 0); - rv = MSG_task_receive_ext_bounded(task, alias, (double) jtimeout, host, (double) rate); + const char *alias = env->GetStringUTFChars(jalias, 0); + rv = MSG_task_receive_ext_bounded(task, alias, static_cast(jtimeout), host, static_cast(rate)); if (env->ExceptionOccurred()) return nullptr; if (rv != MSG_OK) { jmsg_throw_status(env,rv); return nullptr; } - 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 */ - jtask_local = env->NewLocalRef(jtask_global); + jobject jtask_local = env->NewLocalRef(jtask_global); env->DeleteGlobalRef(jtask_global); MSG_task_set_data(*task, nullptr); @@ -472,55 +458,42 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_receiveBounded(JNIEnv * env, JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_irecvBounded(JNIEnv * env, jclass cls, jstring jmailbox, jdouble rate) { - msg_comm_t comm; - const char *mailbox; - jclass comm_class; - //pointer to store the task object pointer. - msg_task_t *task = xbt_new(msg_task_t,1); - *task = nullptr; - /* There should be a cac hee */ - comm_class = env->FindClass("org/simgrid/msg/Comm"); - - if (!comm_class) { - jxbt_throw_native(env,bprintf("fieldID or methodID or class not found.")); + jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); + if (!comm_class) return nullptr; - } + + // pointer to store the task object pointer. + msg_task_t* task = xbt_new0(msg_task_t, 1); jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); if (!jcomm) { - jxbt_throw_native(env,bprintf("Can't create a Comm object.")); + jxbt_throw_jni(env, "Can't create a Comm object."); return nullptr; } - mailbox = env->GetStringUTFChars(jmailbox, 0); - - comm = MSG_task_irecv_bounded(task,mailbox, (double) rate); + const char* mailbox = env->GetStringUTFChars(jmailbox, 0); + msg_comm_t comm = MSG_task_irecv_bounded(task, mailbox, static_cast(rate)); + env->ReleaseStringUTFChars(jmailbox, mailbox); env->SetLongField(jcomm, jtask_field_Comm_bind, (jlong) (uintptr_t)(comm)); env->SetLongField(jcomm, jtask_field_Comm_taskBind, (jlong) (uintptr_t)(task)); env->SetBooleanField(jcomm, jtask_field_Comm_receiving, JNI_TRUE); - env->ReleaseStringUTFChars(jmailbox, mailbox); - return jcomm; } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) { - jclass comm_class; - msg_task_t task; - jobject jcomm; msg_comm_t comm; - const char *mailbox; - comm_class = env->FindClass("org/simgrid/msg/Comm"); + jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); if (!comm_class) return nullptr; - jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); - mailbox = env->GetStringUTFChars(jmailbox, 0); + jobject jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); + const char* mailbox = env->GetStringUTFChars(jmailbox, 0); - task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { env->ReleaseStringUTFChars(jmailbox, mailbox); @@ -544,20 +517,19 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject j JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jobject jtask, jstring jmailbox, jdouble maxrate) { - jclass comm_class; msg_task_t task; jobject jcomm; msg_comm_t comm; const char *mailbox; - comm_class = env->FindClass("org/simgrid/msg/Comm"); - - if (!comm_class) return nullptr; + jclass comm_class = env->FindClass("org/simgrid/msg/Comm"); + if (!comm_class) + return nullptr; jcomm = env->NewObject(comm_class, jtask_method_Comm_constructor); mailbox = env->GetStringUTFChars(jmailbox, 0); - task = jtask_to_native_task(jtask, env); + task = jtask_to_native(jtask, env); if (!task) { env->ReleaseStringUTFChars(jmailbox, mailbox); @@ -580,11 +552,11 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isendBounded(JNIEnv *env, jo JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeFinalize(JNIEnv * env, jobject jtask) { - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); - if (!task) { - jxbt_throw_notbound(env, "task", jtask); - return; + if (!task) { + jxbt_throw_notbound(env, "task", jtask); + return; } MSG_task_destroy(task); @@ -605,7 +577,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jta { const char *alias = env->GetStringUTFChars(jalias, 0); - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { env->ReleaseStringUTFChars(jalias, alias); @@ -625,7 +597,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsendBounded(JNIEnv * env, jobj { const char *alias = env->GetStringUTFChars(jalias, 0); - msg_task_t task = jtask_to_native_task(jtask, env); + msg_task_t task = jtask_to_native(jtask, env); if (!task) { env->ReleaseStringUTFChars(jalias, alias); @@ -635,18 +607,15 @@ 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,(double)maxrate); + MSG_task_dsend_bounded(task, alias, msg_task_cancel_on_failed_dsend,static_cast(maxrate)); env->ReleaseStringUTFChars(jalias, alias); } JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls, jstring jalias) { - const char *alias; - int rv; - - alias = env->GetStringUTFChars(jalias, 0); - rv = MSG_task_listen(alias); + const char *alias = env->GetStringUTFChars(jalias, 0); + int rv = MSG_task_listen(alias); env->ReleaseStringUTFChars(jalias, alias); return (jboolean) rv; @@ -654,10 +623,11 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass JNIEXPORT jint JNICALL Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls, jstring jalias) { - int rv; const char *alias = env->GetStringUTFChars(jalias, 0); - rv = MSG_task_listen_from(alias); + int rv = MSG_task_listen_from(alias); env->ReleaseStringUTFChars(jalias, alias); return (jint) rv; } + +SG_END_DECL()