X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82791f187dbb46144e40afb1a2b6a467df41dbc1..f3e4803befab19389587dd1d9af5ecdeffec551e:/src/bindings/java/jmsg.c diff --git a/src/bindings/java/jmsg.c b/src/bindings/java/jmsg.c index 6c4b587462..685e2b38cd 100644 --- a/src/bindings/java/jmsg.c +++ b/src/bindings/java/jmsg.c @@ -1,12 +1,12 @@ /* Java Wrappers to the MSG API. */ -/* Copyright (c) 2007-2012. The SimGrid Team. +/* Copyright (c) 2007-2014. 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ -#include +#include #include #include #include @@ -16,7 +16,10 @@ #include "jmsg_process.h" +#include "jmsg_as.h" + #include "jmsg_host.h" +#include "jmsg_storage.h" #include "jmsg_task.h" #include "jxbt_utilities.h" @@ -31,6 +34,9 @@ #endif /* end of eclipse-mandated pimple */ +int JAVA_HOST_LEVEL; +int JAVA_STORAGE_LEVEL; + static int create_jprocess(int argc, char *argv[]); XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg); @@ -61,8 +67,11 @@ void jmsg_throw_status(JNIEnv *env, msg_error_t status) { case MSG_HOST_FAILURE: jxbt_throw_host_failure(env,NULL); break; + case MSG_TASK_CANCELED: + jxbt_throw_task_cancelled(env,NULL); + break; default: - jxbt_throw_native(env,bprintf("communication failed")); + jxbt_throw_native(env,xbt_strdup("undefined message failed (please see jmsg_throw_status function in jmsg.c)")); } } @@ -77,6 +86,14 @@ Java_org_simgrid_msg_Msg_getClock(JNIEnv * env, jclass cls) return (jdouble) MSG_get_clock(); } +static void __JAVA_host_priv_free(void *host) +{ +} + +static void __JAVA_storage_priv_free(void *storage) +{ +} + JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) { @@ -87,20 +104,14 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) const char *tmp; XBT_LOG_CONNECT(jmsg); -#ifdef HAVE_TRACING XBT_LOG_CONNECT(jtrace); -#endif (*env)->GetJavaVM(env, &__java_vm); - if ((*env)->FindClass(env, "java/dyn/Coroutine")) { - XBT_INFO("Using Coroutines. Your simulation is on steroid."); - smx_factory_initializer_to_use = SIMIX_ctx_cojava_factory_init; - } - else { - XBT_INFO("Using regular java threads. Coroutines could speed your simulation up."); - smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init; - } + if ((*env)->FindClass(env, "java/dyn/Coroutine")) + smx_factory_initializer_to_use = SIMIX_ctx_cojava_factory_init; + else + smx_factory_initializer_to_use = SIMIX_ctx_java_factory_init; jthrowable exc = (*env)->ExceptionOccurred(env); if (exc) { (*env)->ExceptionClear(env); @@ -113,22 +124,32 @@ Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, jobjectArray jargs) argc++; argv = xbt_new(char *, argc + 1); - argv[0] = strdup("java"); + argv[0] = xbt_strdup("java"); for (index = 0; index < argc - 1; index++) { jval = (jstring) (*env)->GetObjectArrayElement(env, jargs, index); tmp = (*env)->GetStringUTFChars(env, jval, 0); - argv[index + 1] = strdup(tmp); + argv[index + 1] = xbt_strdup(tmp); (*env)->ReleaseStringUTFChars(env, jval, tmp); } argv[argc] = NULL; MSG_init(&argc, argv); + JAVA_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __JAVA_host_priv_free); + JAVA_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __JAVA_storage_priv_free); + for (index = 0; index < argc; index++) free(argv[index]); free(argv); + + if (smx_factory_initializer_to_use == SIMIX_ctx_cojava_factory_init) + XBT_INFO("Using Coroutines. Your simulation is on steroid."); + else if (smx_factory_initializer_to_use == SIMIX_ctx_java_factory_init) + XBT_INFO("Using regular java threads. Coroutines could speed your simulation up."); + else + xbt_die("Unknown context factory. Please report bug."); } JNIEXPORT void JNICALL @@ -136,27 +157,39 @@ JNIEXPORT void JNICALL { msg_error_t rv; int index; - xbt_dynar_t hosts; - jobject jhost; + xbt_dynar_t hosts, storages; + jobject jhost, jstorage; + /* Run everything */ XBT_DEBUG("Ready to run MSG_MAIN"); rv = MSG_main(); XBT_DEBUG("Done running MSG_MAIN"); jxbt_check_res("MSG_main()", rv, MSG_OK, - bprintf - ("unexpected error : MSG_main() failed .. please report this bug ")); + xbt_strdup("unexpected error : MSG_main() failed .. please report this bug ")); XBT_INFO("MSG_main finished; Cleaning up the simulation..."); /* Cleanup java hosts */ hosts = MSG_hosts_as_dynar(); for (index = 0; index < xbt_dynar_length(hosts) - 1; index++) { - jhost = (jobject) MSG_host_get_data(xbt_dynar_get_as(hosts,index,msg_host_t)); + jhost = (jobject) xbt_lib_get_level(xbt_dynar_get_as(hosts,index,msg_host_t), JAVA_HOST_LEVEL); if (jhost) jhost_unref(env, jhost); } xbt_dynar_free(&hosts); + + /* Cleanup java storages */ + storages = MSG_storages_as_dynar(); + if(!xbt_dynar_is_empty(storages)){ + for (index = 0; index < xbt_dynar_length(storages) - 1; index++) { + jstorage = (jobject) xbt_lib_get_level(xbt_dynar_get_as(storages,index,msg_storage_t), JAVA_STORAGE_LEVEL); + if (jstorage) + jstorage_unref(env, jstorage); + } + } + xbt_dynar_free(&storages); + } JNIEXPORT void JNICALL @@ -171,6 +204,26 @@ Java_org_simgrid_msg_Msg_createEnvironment(JNIEnv * env, jclass cls, (*env)->ReleaseStringUTFChars(env, jplatformFile, platformFile); } + +JNIEXPORT jobject JNICALL +Java_org_simgrid_msg_Msg_environmentGetRoutingRoot(JNIEnv * env, jclass cls) +{ + msg_as_t as = MSG_environment_get_routing_root(); + jobject jas = jas_new_instance(env); + if (!jas) { + jxbt_throw_jni(env, "java As instantiation failed"); + return NULL; + } + jas = jas_ref(env, jas); + if (!jas) { + jxbt_throw_jni(env, "new global ref allocation failed"); + return NULL; + } + jas_bind(jas, as, env); + + return (jobject) jas; +} + JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_debug(JNIEnv * env, jclass cls, jstring js) { @@ -236,7 +289,7 @@ static int create_jprocess(int argc, char *argv[]) { jclass class_Process = (*env)->FindClass(env, argv[0]); xbt_str_subst(argv[0],'/','.',0); //Retrieve the methodID for the constructor - xbt_assert((class_Process != NULL), "Class not found."); + xbt_assert((class_Process != NULL), "Class not found (%s). The deployment file must use the fully qualified class name, including the package. The case is important.", argv[0]); jmethodID constructor_Process = (*env)->GetMethodID(env, class_Process, "", "(Lorg/simgrid/msg/Host;Ljava/lang/String;[Ljava/lang/String;)V"); xbt_assert((constructor_Process != NULL), "Constructor not found for class %s. Is there a (Host, String ,String[]) constructor in your class ?", argv[0]); @@ -267,4 +320,3 @@ static int create_jprocess(int argc, char *argv[]) { return 0; } -