X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51f5efedb7e873fa0c82bdc8bb0aa78ae3e827c7..907e0ad42ebe9ac4074648201519ecc10d1f8812:/src/java/jmsg.c diff --git a/src/java/jmsg.c b/src/java/jmsg.c index 24d141360a..57367ff560 100644 --- a/src/java/jmsg.c +++ b/src/java/jmsg.c @@ -1,14 +1,11 @@ -/* - * $Id$ - * - * Copyright 2006,2007 Martin Quinson, Malek Cherier All right 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. - * - * This contains the implementation of the wrapper functions used to interface - * the java object with the native functions of the MSG API. - */ +/* Java Wrappers to the MSG API. */ + +/* Copyright (c) 2007, 2008, 2009, 2010. 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 "msg/msg.h" #include "msg/private.h" #include "simix/private.h" @@ -20,14 +17,10 @@ #include "jmsg_application_handler.h" #include "jxbt_utilities.h" - #include "jmsg.h" - #include "msg/mailbox.h" - #include "surf/surfxml_parse.h" - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); static JavaVM *__java_vm = NULL; @@ -54,14 +47,14 @@ static jobject native_to_java_process(m_process_t process) (process->simdata->s_process->context))->jprocess; } - /* * The MSG process connected functions implementation. */ JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, - jobject jprocess_arg, jobject jhost) + jobject jprocess_arg, + jobject jhost) { jobject jprocess; /* the global reference to the java process instance */ jstring jname; /* the name of the java process instance */ @@ -71,8 +64,8 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, msg_mailbox_t mailbox; DEBUG4 - ("Java_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)", - env, cls, jprocess_arg, jhost); + ("Java_simgrid_msg_MsgNative_processCreate(env=%p,cls=%p,jproc=%p,jhost=%p)", + env, cls, jprocess_arg, jhost); /* get the name of the java process */ jname = jprocess_get_name(jprocess_arg, env); @@ -119,22 +112,23 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, /* create a new context */ DEBUG8 - ("fill in process %s/%s (pid=%d) %p (sd=%p, host=%p, host->sd=%p); env=%p", - process->name, process->simdata->m_host->name, process->simdata->PID, - process, process->simdata, process->simdata->m_host, - process->simdata->m_host->simdata, env); - - process->simdata->s_process = - SIMIX_process_create(process->name, (xbt_main_func_t)jprocess, - /*data */ (void *) process, - process->simdata->m_host->simdata->smx_host->name, - 0, NULL, NULL); - + ("fill in process %s/%s (pid=%d) %p (sd=%p, host=%p, host->sd=%p); env=%p", + process->name, process->simdata->m_host->name, + process->simdata->PID, process, process->simdata, + process->simdata->m_host, process->simdata->m_host->simdata, env); + + process->simdata->s_process = + SIMIX_process_create(process->name, (xbt_main_func_t) jprocess, + /*data */ (void *) process, + process->simdata->m_host->simdata-> + smx_host->name, 0, NULL, NULL); + DEBUG1("context created (s_process=%p)", process->simdata->s_process); if (SIMIX_process_self()) { /* someone created me */ - process->simdata->PPID = MSG_process_get_PID(SIMIX_process_self()->data); + process->simdata->PPID = + MSG_process_get_PID(SIMIX_process_self()->data); } else { process->simdata->PPID = -1; } @@ -144,11 +138,12 @@ Java_simgrid_msg_MsgNative_processCreate(JNIEnv * env, jclass cls, /* add the process to the list of the processes of the simulation */ xbt_fifo_unshift(msg_global->process_list, process); - sprintf(alias, "%s:%s", (process->simdata->m_host->simdata->smx_host)->name, + sprintf(alias, "%s:%s", + (process->simdata->m_host->simdata->smx_host)->name, process->name); mailbox = MSG_mailbox_new(alias); - + } JNIEXPORT void JNICALL @@ -163,8 +158,11 @@ Java_simgrid_msg_MsgNative_processSuspend(JNIEnv * env, jclass cls, } /* try to suspend the process */ - if (MSG_OK != MSG_process_suspend(process)) - jxbt_throw_native(env, xbt_strdup("MSG_process_suspend() failed")); + MSG_error_t rv = MSG_process_suspend(process); + + jxbt_check_res("MSG_process_suspend()", rv, MSG_OK, + bprintf("unexpected error , please report this bug")); + } JNIEXPORT void JNICALL @@ -179,8 +177,10 @@ Java_simgrid_msg_MsgNative_processResume(JNIEnv * env, jclass cls, } /* try to resume the process */ - if (MSG_OK != MSG_process_resume(process)) - jxbt_throw_native(env, xbt_strdup("MSG_process_resume() failed")); + MSG_error_t rv = MSG_process_resume(process); + + jxbt_check_res("MSG_process_resume()", rv, MSG_OK, + bprintf("unexpected error , please report this bug")); } JNIEXPORT jboolean JNICALL @@ -234,28 +234,29 @@ Java_simgrid_msg_MsgNative_processGetHost(JNIEnv * env, jclass cls, host = MSG_process_get_host(process); - if (!host->data) { - jxbt_throw_native(env, xbt_strdup("MSG_process_get_host() failed")); + if (!MSG_host_get_data(host)) { + jxbt_throw_jni(env, "MSG_process_get_host() failed"); return NULL; } /* return the global reference to the java host instance */ - return (jobject) host->data; + return (jobject) MSG_host_get_data(host); } JNIEXPORT jobject JNICALL -Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls, jint PID) +Java_simgrid_msg_MsgNative_processFromPID(JNIEnv * env, jclass cls, + jint PID) { m_process_t process = MSG_process_from_PID(PID); if (!process) { - jxbt_throw_process_not_found(env, bprintf("PID = %d", PID)); + jxbt_throw_process_not_found(env, bprintf("PID = %d",(int) PID)); return NULL; } if (!native_to_java_process(process)) { - jxbt_throw_native(env, xbt_strdup("SIMIX_process_get_jprocess() failed")); + jxbt_throw_jni(env, "SIMIX_process_get_jprocess() failed"); return NULL; } @@ -299,14 +300,14 @@ Java_simgrid_msg_MsgNative_processSelf(JNIEnv * env, jclass cls) jobject jprocess; if (!process) { - jxbt_throw_native(env, xbt_strdup("MSG_process_self() failed")); + jxbt_throw_jni(env, xbt_strdup("MSG_process_self() failed")); return NULL; } jprocess = native_to_java_process(process); if (!jprocess) - jxbt_throw_native(env, xbt_strdup("SIMIX_process_get_jprocess() failed")); + jxbt_throw_jni(env, xbt_strdup("SIMIX_process_get_jprocess() failed")); return jprocess; } @@ -323,18 +324,23 @@ Java_simgrid_msg_MsgNative_processChangeHost(JNIEnv * env, jclass cls, } /* try to change the host of the process */ - if (MSG_OK != MSG_process_change_host(host)) - jxbt_throw_native(env, xbt_strdup("MSG_process_change_host() failed")); + MSG_error_t rv = MSG_process_change_host(host); + + jxbt_check_res("MSG_process_change_host()", rv, MSG_OK, + bprintf("unexpected error , please report this bug")); + } JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_processWaitFor(JNIEnv * env, jclass cls, jdouble seconds) { - if (MSG_OK != MSG_process_sleep((double) seconds)) - jxbt_throw_native(env, - bprintf("MSG_process_change_host(%f) failed", - (double) seconds)); + MSG_error_t rv = MSG_process_sleep((double) seconds); + + jxbt_check_res("MSG_process_sleep()", rv, MSG_HOST_FAILURE, + bprintf("while process was waiting for %f seconds", + (double) seconds)); + } @@ -363,7 +369,7 @@ Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls, return NULL; } - if (!host->data) { /* native host not associated yet with java host */ + if (!MSG_host_get_data(host)) { /* native host not associated yet with java host */ /* instanciate a new java host */ jhost = jhost_new_instance(env); @@ -387,11 +393,11 @@ Java_simgrid_msg_MsgNative_hostGetByName(JNIEnv * env, jclass cls, /* the native host data field is set with the global reference to the * java host returned by this function */ - host->data = (void *) jhost; + MSG_host_set_data(host, (void *) jhost); } /* return the global reference to the java host instance */ - return (jobject) host->data; + return (jobject) MSG_host_get_data(host); } JNIEXPORT jstring JNICALL @@ -405,7 +411,7 @@ Java_simgrid_msg_MsgNative_hostGetName(JNIEnv * env, jclass cls, return NULL; } - return (*env)->NewStringUTF(env, host->name); + return (*env)->NewStringUTF(env, MSG_host_get_name(host)); } JNIEXPORT jint JNICALL @@ -421,7 +427,7 @@ Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls) m_host_t host = MSG_host_self(); - if (!host->data) { + if (!MSG_host_get_data(host)) { /* the native host not yet associated with the java host instance */ /* instanciate a new java host instance */ @@ -442,9 +448,9 @@ Java_simgrid_msg_MsgNative_hostSelf(JNIEnv * env, jclass cls) /* Bind & store it */ jhost_bind(jhost, host, env); - host->data = (void *) jhost; + MSG_host_set_data(host, (void *) jhost); } else { - jhost = (jobject) host->data; + jhost = (jobject) MSG_host_get_data(host); } return jhost; @@ -499,17 +505,19 @@ Java_simgrid_msg_MsgNative_hostIsAvail(JNIEnv * env, jclass cls, ***************************************************************************************/ JNIEXPORT void JNICALL -Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls, jobject jtask, - jstring jname, jdouble jcomputeDuration, +Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls, + jobject jtask, jstring jname, + jdouble jcomputeDuration, jdouble jmessageSize) { m_task_t task; /* the native task to create */ - const char *name=NULL; /* the name of the task */ + const char *name = NULL; /* the name of the task */ if (jcomputeDuration < 0) { jxbt_throw_illegal(env, - bprintf("Task ComputeDuration (%f) cannot be negative", - (double) jcomputeDuration)); + bprintf + ("Task ComputeDuration (%f) cannot be negative", + (double) jcomputeDuration)); return; } @@ -528,30 +536,26 @@ Java_simgrid_msg_MsgNative_taskCreate(JNIEnv * env, jclass cls, jobject jtask, /* create the task */ task = - MSG_task_create(name, (double) jcomputeDuration, (double) jmessageSize, - NULL); + MSG_task_create(name, (double) jcomputeDuration, + (double) jmessageSize, NULL); if (jname) (*env)->ReleaseStringUTFChars(env, jname, name); /* bind & store the task */ jtask_bind(jtask, task, env); - - /* allocate a new global reference to the java task instance */ - task->data = (void *) jtask_new_global_ref(jtask, env); - - if (!task->data) - jxbt_throw_jni(env, "global ref allocation failed"); - + MSG_task_set_data(task, jtask); } JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls, - jobject jtask, jstring jname, + jobject jtask, + jstring jname, jobjectArray jhosts, jdoubleArray jcomputeDurations_arg, - jdoubleArray jmessageSizes_arg) + jdoubleArray + jmessageSizes_arg) { m_task_t task; /* the native parallel task to create */ @@ -576,7 +580,8 @@ Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls, if (!jmessageSizes_arg) { jxbt_throw_null(env, - xbt_strdup("Parallel task message sizes cannot be null")); + xbt_strdup + ("Parallel task message sizes cannot be null")); return; } @@ -593,8 +598,9 @@ Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls, messageSizes = xbt_new0(double, host_count * host_count); jcomputeDurations = - (*env)->GetDoubleArrayElements(env, jcomputeDurations_arg, 0); - jmessageSizes = (*env)->GetDoubleArrayElements(env, jmessageSizes_arg, 0); + (*env)->GetDoubleArrayElements(env, jcomputeDurations_arg, 0); + jmessageSizes = + (*env)->GetDoubleArrayElements(env, jmessageSizes_arg, 0); for (index = 0; index < host_count; index++) { jhost = (*env)->GetObjectArrayElement(env, jhosts, index); @@ -615,17 +621,17 @@ Java_simgrid_msg_MsgNative_parallel_taskCreate(JNIEnv * env, jclass cls, name = (*env)->GetStringUTFChars(env, jname, 0); task = - MSG_parallel_task_create(name, host_count, hosts, computeDurations, - messageSizes, NULL); + MSG_parallel_task_create(name, host_count, hosts, computeDurations, + messageSizes, NULL); (*env)->ReleaseStringUTFChars(env, jname, name); /* associate the java task object and the native task */ jtask_bind(jtask, task, env); - task->data = (void *) jtask; + MSG_task_set_data(task, (void *) jtask); - if (!task->data) + if (!MSG_task_get_data(task)) jxbt_throw_jni(env, "global ref allocation failed"); } @@ -660,12 +666,12 @@ Java_simgrid_msg_MsgNative_taskGetSource(JNIEnv * env, jclass cls, host = MSG_task_get_source(task); - if (!host->data) { - jxbt_throw_native(env, xbt_strdup("MSG_task_get_source() failed")); + if (!MSG_host_get_data(host)) { + jxbt_throw_jni(env, "MSG_task_get_source() failed"); return NULL; } - return (jobject) host->data; + return (jobject) MSG_host_get_data(host); } @@ -680,11 +686,12 @@ Java_simgrid_msg_MsgNative_taskGetName(JNIEnv * env, jclass cls, return NULL; } - return (*env)->NewStringUTF(env, task->name); + return (*env)->NewStringUTF(env, MSG_task_get_name(task)); } JNIEXPORT void JNICALL -Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls, jobject jtask) +Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls, + jobject jtask) { m_task_t ptask = jtask_to_native_task(jtask, env); @@ -693,8 +700,10 @@ Java_simgrid_msg_MsgNative_taskCancel(JNIEnv * env, jclass cls, jobject jtask) return; } - if (MSG_OK != MSG_task_cancel(ptask)) - jxbt_throw_native(env, xbt_strdup("MSG_task_cancel() failed")); + MSG_error_t rv = MSG_task_cancel(ptask); + + jxbt_check_res("MSG_task_cancel()", rv, MSG_OK, + bprintf("unexpected error , please report this bug")); } JNIEXPORT jdouble JNICALL @@ -711,7 +720,8 @@ Java_simgrid_msg_MsgNative_taskGetComputeDuration(JNIEnv * env, jclass cls, } JNIEXPORT jdouble JNICALL -Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env, jclass cls, +Java_simgrid_msg_MsgNative_taskGetRemainingDuration(JNIEnv * env, + jclass cls, jobject jtask) { m_task_t ptask = jtask_to_native_task(jtask, env); @@ -749,13 +759,12 @@ Java_simgrid_msg_MsgNative_taskDestroy(JNIEnv * env, jclass cls, jxbt_throw_notbound(env, "task", task); return; } - jtask = (jobject) task->data; + jtask = (jobject) MSG_task_get_data(task); - if (MSG_OK != MSG_task_destroy(task)) - jxbt_throw_native(env, xbt_strdup("MSG_task_destroy() failed")); + MSG_error_t rv = MSG_task_destroy(task); - /* delete the global reference to the java task object */ - jtask_delete_global_ref(jtask, env); + jxbt_check_res("MSG_task_destroy()", rv, MSG_OK, + bprintf("unexpected error , please report this bug")); } JNIEXPORT void JNICALL @@ -769,8 +778,12 @@ Java_simgrid_msg_MsgNative_taskExecute(JNIEnv * env, jclass cls, return; } - if (MSG_OK != MSG_task_execute(task)) - jxbt_throw_native(env, xbt_strdup("MSG_task_execute() failed")); + MSG_error_t rv = MSG_task_execute(task); + + jxbt_check_res("MSG_task_execute()", rv, + MSG_HOST_FAILURE | MSG_TASK_CANCELLED, + bprintf("while executing task %s", + MSG_task_get_name(task))); } /*************************************************************************************** @@ -792,13 +805,16 @@ Java_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls) JNIEXPORT void JNICALL -Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) { +Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) +{ char **argv = NULL; int index; int argc = 0; jstring jval; const char *tmp; + factory_initializer_to_use = SIMIX_ctx_java_factory_init; + if (jargs) argc = (int) (*env)->GetArrayLength(env, jargs); @@ -814,7 +830,6 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) { } MSG_global_init(&argc, argv); - SIMIX_context_select_factory("java"); for (index = 0; index < argc; index++) free(argv[index]); @@ -825,32 +840,39 @@ Java_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) { } JNIEXPORT void JNICALL - JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) { - xbt_fifo_item_t item = NULL; - m_host_t host = NULL; + JNICALL Java_simgrid_msg_Msg_run(JNIEnv * env, jclass cls) +{ + MSG_error_t rv; + int index; //xbt_fifo_item_t item = NULL; + m_host_t *hosts; jobject jhost; /* Run everything */ - if (MSG_OK != MSG_main()) { - jxbt_throw_native(env, xbt_strdup("MSG_main() failed")); - } + rv = MSG_main(); + jxbt_check_res("MSG_main()", rv, MSG_OK, + bprintf + ("unexpected error : MSG_main() failed .. please report this bug ")); + DEBUG0 - ("MSG_main finished. Bail out before cleanup since there is a bug in this part."); + ("MSG_main finished. Bail out before cleanup since there is a bug in this part."); DEBUG0("Clean java world"); /* Cleanup java hosts */ - xbt_fifo_foreach(msg_global->host, item, host, m_host_t) { - jhost = (jobject) host->data; - + hosts = MSG_get_host_table(); + for (index = 0; index < MSG_get_host_number() - 1; index++) { + jhost = (jobject) hosts[index]->data; if (jhost) jhost_unref(env, jhost); + } DEBUG0("Clean native world"); /* cleanup native stuff */ - if (MSG_OK != MSG_clean()){ - jxbt_throw_native(env, xbt_strdup("MSG_main() failed")); - } + rv = MSG_OK != MSG_clean(); + jxbt_check_res("MSG_clean()", rv, MSG_OK, + bprintf + ("unexpected error : MSG_clean() failed .. please report this bug ")); + } JNIEXPORT jint JNICALL @@ -865,7 +887,8 @@ Java_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, jstring jplatformFile) { - const char *platformFile = (*env)->GetStringUTFChars(env, jplatformFile, 0); + const char *platformFile = + (*env)->GetStringUTFChars(env, jplatformFile, 0); MSG_create_environment(platformFile); @@ -904,8 +927,8 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg) jstring jname; m_host_t host; - int count = xbt_fifo_size(msg_global->host); - m_host_t *table = (m_host_t *) xbt_fifo_to_array(msg_global->host); + int count = MSG_get_host_number(); + m_host_t *table = MSG_get_host_table(); jclass cls = jxbt_get_class(env, "simgrid/msg/Host"); @@ -922,12 +945,13 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg) for (index = 0; index < count; index++) { host = table[index]; - jhost = (jobject) (host->data); + jhost = (jobject) (MSG_host_get_data(host)); if (!jhost) { - jname = (*env)->NewStringUTF(env, host->name); + jname = (*env)->NewStringUTF(env, MSG_host_get_name(host)); - jhost = Java_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname); + jhost = + Java_simgrid_msg_MsgNative_hostGetByName(env, cls_arg, jname); /* FIXME: leak of jname ? */ } @@ -937,33 +961,6 @@ Java_simgrid_msg_MsgNative_allHosts(JNIEnv * env, jclass cls_arg) return jtable; } - -JNIEXPORT void JNICALL -Java_simgrid_msg_MsgNative_selectContextFactory(JNIEnv * env, jclass class, - jstring jname) -{ - char *errmsg = NULL; - xbt_ex_t e; - - /* get the C string from the java string */ - const char *name = (*env)->GetStringUTFChars(env, jname, 0); - - TRY { - SIMIX_context_select_factory(name); - } CATCH(e) { - errmsg = xbt_strdup(e.msg); - xbt_ex_free(e); - } - - (*env)->ReleaseStringUTFChars(env, jname, name); - - if (errmsg) { - char *thrown = bprintf("xbt_select_context_factory() failed: %s", errmsg); - free(errmsg); - jxbt_throw_native(env, thrown); - } -} - JNIEXPORT void JNICALL Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls, jstring jalias, jobject jtask, @@ -982,18 +979,16 @@ Java_simgrid_msg_MsgNative_taskSend(JNIEnv * env, jclass cls, return; } + /* 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); (*env)->ReleaseStringUTFChars(env, jalias, alias); - /* FIXME throw the right exception corresponding to HostFailureException, TransferFailureException, TimeoutFailureException - * Note: these exceptions must be created beforehand - * then, you want to create some functions like jxbt_throw_notbound() - * then, you must declare in the MsgNative stuff that these native functions can throw these exceptions - */ - if (MSG_OK != rv) - jxbt_throw_native(env, xbt_strdup("MSG_task_send_with_timeout() failed")); - + 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)); } JNIEXPORT void JNICALL @@ -1012,12 +1007,18 @@ Java_simgrid_msg_MsgNative_taskSendBounded(JNIEnv * env, jclass cls, alias = (*env)->GetStringUTFChars(env, jalias, 0); + /* 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); (*env)->ReleaseStringUTFChars(env, jalias, alias); - if (MSG_OK != rv) - jxbt_throw_native(env, xbt_strdup("MSG_task_send_bounded() failed")); + 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)); + } JNIEXPORT jobject JNICALL @@ -1028,6 +1029,7 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls, MSG_error_t rv; m_task_t task = NULL; m_host_t host = NULL; + jobject jtask_global, jtask_local; const char *alias; if (jhost) { @@ -1042,15 +1044,20 @@ Java_simgrid_msg_MsgNative_taskReceive(JNIEnv * env, jclass cls, alias = (*env)->GetStringUTFChars(env, jalias, 0); rv = MSG_task_receive_ext(&task, alias, (double) jtimeout, host); + 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); (*env)->ReleaseStringUTFChars(env, jalias, alias); - if (MSG_OK != rv) { - jxbt_throw_native(env, xbt_strdup("MSG_task_receive_ext() failed")); - return NULL; - } + jxbt_check_res("MSG_task_receive_ext()", rv, + MSG_HOST_FAILURE | MSG_TRANSFER_FAILURE | MSG_TIMEOUT, + bprintf("while receiving from mailbox %s", alias)); - return (jobject) task->data; + return (jobject) jtask_local; } JNIEXPORT jboolean JNICALL @@ -1072,9 +1079,9 @@ Java_simgrid_msg_MsgNative_taskListen(JNIEnv * env, jclass cls, JNIEXPORT jint JNICALL Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls, - jstring jalias, jobject jhost) + jstring jalias, + jobject jhost) { - int rv; const char *alias; @@ -1084,7 +1091,6 @@ Java_simgrid_msg_MsgNative_taskListenFromHost(JNIEnv * env, jclass cls, jxbt_throw_notbound(env, "host", jhost); return -1; } - alias = (*env)->GetStringUTFChars(env, jalias, 0); rv = MSG_task_listen_from_host(alias, host); @@ -1115,7 +1121,7 @@ Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, { const char *deploymentFile = - (*env)->GetStringUTFChars(env, jdeploymentFile, 0); + (*env)->GetStringUTFChars(env, jdeploymentFile, 0); surf_parse_reset_parser(); @@ -1136,7 +1142,7 @@ Java_simgrid_msg_Msg_deployApplication(JNIEnv * env, jclass cls, japplication_handler_on_start_document(); if (surf_parse()) - jxbt_throw_native(env, xbt_strdup("surf_parse() failed")); + jxbt_throw_jni(env, "surf_parse() failed"); surf_parse_close();