X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc436d65d9cca17916fe60d8f3bc6c052541699c..01f4354d59ef70e1b57fb8f50a927b5566c47ce9:/src/jmsg_task.c diff --git a/src/jmsg_task.c b/src/jmsg_task.c index 72a6480642..00a065d1f8 100644 --- a/src/jmsg_task.c +++ b/src/jmsg_task.c @@ -16,11 +16,13 @@ #include "jxbt_utilities.h" #include + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); -static jmethodID jtask_field_Comm_constructor; +static jmethodID jtask_method_Comm_constructor; static jfieldID jtask_field_Task_bind; +static jfieldID jtask_field_Task_name; static jfieldID jtask_field_Comm_bind; static jfieldID jtask_field_Comm_taskBind; static jfieldID jtask_field_Comm_receiving; @@ -42,18 +44,19 @@ jboolean jtask_is_valid(jobject jtask, JNIEnv * env) JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_nativeInit(JNIEnv *env, jclass cls) { - jclass jtask_class_Comm = (*env)->FindClass(env, "org/simgrid/msg/Comm"); - - jtask_field_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "", "()V"); - //FIXME: Don't use jxbt_get_sfield directly, it is slower. - jtask_field_Task_bind = jxbt_get_sfield(env, "org/simgrid/msg/Task", "bind", "J"); - jtask_field_Comm_bind = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "bind", "J"); - jtask_field_Comm_taskBind = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "taskBind", "J"); - jtask_field_Comm_receiving = jxbt_get_sfield(env, "org/simgrid/msg/Comm", "receiving", "Z"); - if (!jtask_field_Task_bind || !jtask_field_Comm_bind || !jtask_field_Comm_taskBind || - !jtask_field_Comm_receiving || !jtask_field_Comm_constructor) { - jxbt_throw_native(env,bprintf("Can't find some fields in Java class.")); - } + jclass jtask_class_Comm = (*env)->FindClass(env, "org/simgrid/msg/Comm"); + jclass jtask_class_Task = (*env)->FindClass(env, "org/simgrid/msg/Task"); + + jtask_method_Comm_constructor = (*env)->GetMethodID(env, jtask_class_Comm, "", "()V"); + jtask_field_Task_bind = jxbt_get_jfield(env, jtask_class_Task, "bind", "J"); + jtask_field_Task_name = jxbt_get_jfield(env, jtask_class_Task, "name", "Ljava/lang/String;"); + 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.")); + } } JNIEXPORT void JNICALL @@ -76,7 +79,7 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env, if (jmessageSize < 0) { jxbt_throw_illegal(env, bprintf("Task MessageSize (%f) cannot be negative", - (double) jmessageSize)); + (double) jmessageSize)); return; } @@ -85,14 +88,14 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env, name = (*env)->GetStringUTFChars(env, jname, 0); } - /* create the task */ task = MSG_task_create(name, (double) jcomputeDuration, - (double) jmessageSize, NULL); + (double) jmessageSize, NULL); if (jname) (*env)->ReleaseStringUTFChars(env, jname, name); - + /* sets the task name */ + (*env)->SetObjectField(env, jtask, jtask_field_Task_name, jname); /* bind & store the task */ jtask_bind(jtask, task, env); MSG_task_set_data(task, jtask); @@ -100,13 +103,13 @@ Java_org_simgrid_msg_Task_create(JNIEnv * env, JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, - jobject jtask, - jstring jname, - jobjectArray jhosts, - jdoubleArray - jcomputeDurations_arg, - jdoubleArray - jmessageSizes_arg) { + jobject jtask, + jstring jname, + jobjectArray jhosts, + jdoubleArray + jcomputeDurations_arg, + jdoubleArray + jmessageSizes_arg) { m_task_t task; /* the native parallel task to create */ const char *name; /* the name of the task */ @@ -120,7 +123,6 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, jobject jhost; int index; - if (!jcomputeDurations_arg) { jxbt_throw_null(env, xbt_strdup @@ -175,7 +177,8 @@ Java_org_simgrid_msg_Task_parallelCreate(JNIEnv * env, messageSizes, NULL); (*env)->ReleaseStringUTFChars(env, jname, name); - + /* sets the task name */ + (*env)->SetObjectField(env, jtask, jtask_field_Task_name, jname); /* associate the java task object and the native task */ jtask_bind(jtask, task, env); @@ -212,13 +215,18 @@ Java_org_simgrid_msg_Task_execute(JNIEnv * env, jxbt_throw_notbound(env, "task", jtask); return; } - - MSG_error_t rv = MSG_task_execute(task); - - jxbt_check_res("MSG_task_execute()", rv, - MSG_HOST_FAILURE | MSG_TASK_CANCELED, - bprintf("while executing task %s", - MSG_task_get_name(task))); + xbt_ex_t e; + MSG_error_t rv; + TRY { + rv = MSG_task_execute(task); + } + CATCH(e) { + xbt_ex_free(e); + return; + } + if (rv != MSG_OK) { + jmsg_throw_status(env, rv); + } } JNIEXPORT jstring JNICALL @@ -247,6 +255,9 @@ Java_org_simgrid_msg_Task_getSender(JNIEnv * env, } process = MSG_task_get_sender(task); + if (process == NULL) { + return NULL; + } return (jobject) native_to_java_process(process); } @@ -263,7 +274,9 @@ Java_org_simgrid_msg_Task_getSource(JNIEnv * env, } host = MSG_task_get_source(task); - + if (host == NULL) { + return NULL; + } if (!MSG_host_get_data(host)) { jxbt_throw_jni(env, "MSG_task_get_source() failed"); return NULL; @@ -296,7 +309,21 @@ Java_org_simgrid_msg_Task_getRemainingDuration(JNIEnv * env, jobject jtask) } return (jdouble) MSG_task_get_remaining_computation(ptask); } +JNIEXPORT void JNICALL +Java_org_simgrid_msg_Task_setName(JNIEnv *env, jobject jtask, jobject jname) { + m_task_t task = jtask_to_native_task(jtask, env); + if (!task) { + jxbt_throw_notbound(env, "task", jtask); + return; + } + const char *name = (*env)->GetStringUTFChars(env, jname, 0); + + (*env)->SetObjectField(env, jtask, jtask_field_Task_name, jname); + MSG_task_set_name(task, name); + + (*env)->ReleaseStringUTFChars(env, jname, name); +} JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, jobject jtask, jdouble priority) @@ -310,6 +337,17 @@ Java_org_simgrid_msg_Task_setPriority(JNIEnv * env, MSG_task_set_priority(task, (double) priority); } JNIEXPORT void JNICALL +Java_org_simgrid_msg_Task_setComputeDuration + (JNIEnv *env, jobject jtask, jdouble computationAmount) { + m_task_t task = jtask_to_native_task(jtask, env); + + if (!task) { + jxbt_throw_notbound(env, "task", jtask); + return; + } + MSG_task_set_compute_duration(task, (double) computationAmount); +} +JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_send(JNIEnv * env,jobject jtask, jstring jalias, jdouble jtimeout) @@ -328,14 +366,18 @@ 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(env, jtask)); - rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout); - + xbt_ex_t e; + TRY { + rv = MSG_task_send_with_timeout(task, alias, (double) jtimeout); + } + CATCH(e) { + xbt_ex_free(e); + } (*env)->ReleaseStringUTFChars(env, jalias, alias); - jxbt_check_res("MSG_task_send_with_timeout()", rv, - MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT, - bprintf("while sending task %s to mailbox %s", - MSG_task_get_name(task), alias)); + if (rv != MSG_OK) { + jmsg_throw_status(env, rv); + } } JNIEXPORT void JNICALL @@ -356,16 +398,19 @@ Java_org_simgrid_msg_Task_sendBounded(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(env, jtask)); - rv = MSG_task_send_bounded(task, alias, (double) jmaxRate); + xbt_ex_t e; + TRY { + rv = MSG_task_send_bounded(task, alias, (double) jmaxRate); + } + CATCH(e) { + xbt_ex_free(e); + } (*env)->ReleaseStringUTFChars(env, jalias, alias); - jxbt_check_res("MSG_task_send_bounded()", rv, - MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT, - bprintf - ("while sending task %s to mailbox %s with max rate %f", - MSG_task_get_name(task), alias, (double) jmaxRate)); - + if (rv != MSG_OK) { + jmsg_throw_status(env, rv); + } } @@ -375,7 +420,9 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls, jobject jhost) { MSG_error_t rv; - m_task_t task = NULL; + m_task_t *task = xbt_new(m_task_t,1); + *task = NULL; + m_host_t host = NULL; jobject jtask_global, jtask_local; const char *alias; @@ -390,36 +437,28 @@ Java_org_simgrid_msg_Task_receive(JNIEnv * env, jclass cls, } alias = (*env)->GetStringUTFChars(env, jalias, 0); - - rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host); + xbt_ex_t e; + TRY { + rv = MSG_task_receive_ext(task, alias, (double) jtimeout, host); + } + CATCH(e) { + xbt_ex_free(e); + return NULL; + } if (rv != MSG_OK) { - switch (rv) { - case MSG_TIMEOUT: - jxbt_throw_time_out_failure(env,NULL); - break; - case MSG_TRANSFER_FAILURE: - jxbt_throw_transfer_failure(env,NULL); - break; - case MSG_HOST_FAILURE: - jxbt_throw_host_failure(env,NULL); - break; - default: - jxbt_throw_native(env,bprintf("receive failed")); - } + jmsg_throw_status(env,rv); return NULL; } - jtask_global = MSG_task_get_data(task); + jtask_global = 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(env, jtask_global); (*env)->DeleteGlobalRef(env, jtask_global); - MSG_task_set_data(task, NULL); + MSG_task_set_data(*task, NULL); (*env)->ReleaseStringUTFChars(env, jalias, alias); - jxbt_check_res("MSG_task_receive_ext()", rv, - MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT, - bprintf("while receiving from mailbox %s", alias)); + xbt_free(task); return (jobject) jtask_local; } @@ -441,7 +480,7 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) { return NULL; } - jobject jcomm = (*env)->NewObject(env, comm_class, jtask_field_Comm_constructor); + jobject jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor); if (!jcomm) { jxbt_throw_native(env,bprintf("Can't create a Comm object.")); return NULL; @@ -462,58 +501,57 @@ Java_org_simgrid_msg_Task_irecv(JNIEnv * env, jclass cls, jstring jmailbox) { JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_isend(JNIEnv *env, jobject jtask, jstring jmailbox) { - jclass comm_class; + jclass comm_class; - const char *mailbox; + const char *mailbox; - m_task_t task; + m_task_t task; - jobject jcomm; - msg_comm_t comm; + jobject jcomm; + msg_comm_t comm; - comm_class = (*env)->FindClass(env, "org/simgrid/msg/Comm"); + comm_class = (*env)->FindClass(env, "org/simgrid/msg/Comm"); - if (!comm_class) return NULL; + if (!comm_class) return NULL; - jcomm = (*env)->NewObject(env, comm_class, jtask_field_Comm_constructor); - mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0); + jcomm = (*env)->NewObject(env, comm_class, jtask_method_Comm_constructor); + mailbox = (*env)->GetStringUTFChars(env, jmailbox, 0); - task = jtask_to_native_task(jtask, env); + task = jtask_to_native_task(jtask, env); - if (!task) { + if (!task) { (*env)->ReleaseStringUTFChars(env, jmailbox, mailbox); (*env)->DeleteLocalRef(env, jcomm); jxbt_throw_notbound(env, "task", jtask); - return NULL; - } + return NULL; + } - MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask)); - comm = MSG_task_isend(task,mailbox); +MSG_task_set_data(task, (void *) (*env)->NewGlobalRef(env, jtask)); + comm = MSG_task_isend(task,mailbox); - (*env)->SetLongField(env, jcomm, jtask_field_Comm_bind, (jlong) (long)(comm)); - (*env)->SetLongField(env, jcomm, jtask_field_Comm_taskBind, (jlong) (long)(NULL)); - (*env)->SetBooleanField(env, jcomm, jtask_field_Comm_receiving, JNI_FALSE); + (*env)->SetLongField(env, jcomm, jtask_field_Comm_bind, (jlong) (long)(comm)); + (*env)->SetLongField(env, jcomm, jtask_field_Comm_taskBind, (jlong) (long)(NULL)); + (*env)->SetBooleanField(env, jcomm, jtask_field_Comm_receiving, JNI_FALSE); - (*env)->ReleaseStringUTFChars(env, jmailbox, mailbox); + (*env)->ReleaseStringUTFChars(env, jmailbox, mailbox); - return jcomm; + return jcomm; } static void msg_task_cancel_on_failed_dsend(void*t) { - m_task_t task = t; - JNIEnv *env =get_current_thread_env(); - jobject jtask_global = MSG_task_get_data(task); - - /* Destroy the global ref so that the JVM can free the stuff */ - (*env)->DeleteGlobalRef(env, jtask_global); - MSG_task_set_data(task, NULL); - MSG_task_destroy(task); + m_task_t task = t; + JNIEnv *env =get_current_thread_env(); + jobject jtask_global = MSG_task_get_data(task); + + /* Destroy the global ref so that the JVM can free the stuff */ + (*env)->DeleteGlobalRef(env, jtask_global); + MSG_task_set_data(task, NULL); + MSG_task_destroy(task); } JNIEXPORT void JNICALL Java_org_simgrid_msg_Task_dsend(JNIEnv * env, jobject jtask, jstring jalias) { - const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); m_task_t task = jtask_to_native_task(jtask, env); @@ -538,11 +576,16 @@ Java_org_simgrid_msg_Task_listen(JNIEnv * env, jclass cls, const char *alias; int rv; + xbt_ex_t e; alias = (*env)->GetStringUTFChars(env, jalias, 0); - - rv = MSG_task_listen(alias); - + TRY { + rv = MSG_task_listen(alias); + } + CATCH(e) { + xbt_ex_free(e); + return 0; + } (*env)->ReleaseStringUTFChars(env, jalias, alias); return (jboolean) rv; @@ -562,9 +605,15 @@ Java_org_simgrid_msg_Task_listenFromHost(JNIEnv * env, jclass cls, return -1; } alias = (*env)->GetStringUTFChars(env, jalias, 0); + xbt_ex_t e; - rv = MSG_task_listen_from_host(alias, host); - + TRY { + rv = MSG_task_listen_from_host(alias, host); + } + CATCH(e) { + xbt_ex_free(e); + return 0; + } (*env)->ReleaseStringUTFChars(env, jalias, alias); return (jint) rv; @@ -577,9 +626,14 @@ Java_org_simgrid_msg_Task_listenFrom(JNIEnv * env, jclass cls, int rv; const char *alias = (*env)->GetStringUTFChars(env, jalias, 0); - - rv = MSG_task_listen_from(alias); - + xbt_ex_t e; + TRY { + rv = MSG_task_listen_from(alias); + } + CATCH(e) { + xbt_ex_free(e); + return 0; + } (*env)->ReleaseStringUTFChars(env, jalias, alias); return (jint) rv;