X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93b7fb3201585c6c2734b41565cddd8ee9591146..12fdd5a6725a42b1c3baf51e9927462ae5b6db44:/src/smx_context_java.c diff --git a/src/smx_context_java.c b/src/smx_context_java.c index 5fe260fced..a31c9519d3 100644 --- a/src/smx_context_java.c +++ b/src/smx_context_java.c @@ -8,15 +8,25 @@ #include -#include +#include +#include #include "smx_context_java.h" +#include "jxbt_utilities.h" #include "xbt/dynar.h" +JavaVM *get_current_vm(void); +JavaVM *get_current_vm(void) +{ + JavaVM *jvm; + JNI_GetCreatedJavaVMs(&jvm,1,NULL); + return jvm; +} + + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jmsg, bindings, "MSG for Java(TM)"); static smx_context_t my_current_context = NULL; -static smx_context_t smx_ctx_java_self(void); static smx_context_t smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char **argv, @@ -25,12 +35,10 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, static void smx_ctx_java_free(smx_context_t context); static void smx_ctx_java_start(smx_context_t context); -static void smx_ctx_java_stop(smx_context_t context); static void smx_ctx_java_suspend(smx_context_t context); static void smx_ctx_java_resume(smx_context_t new_context); -static void smx_ctx_java_runall(xbt_dynar_t processes); -static void* smx_ctx_java_get_data(smx_context_t context); - +static void smx_ctx_java_runall(void); +static void* smx_ctx_java_thread_run(void *data); void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory) { /* instantiate the context factory */ @@ -46,26 +54,18 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory) //(*factory)->finalize = smx_ctx_base_factory_finalize; (*factory)->self = smx_ctx_java_self; (*factory)->get_data = smx_ctx_base_get_data; - (*factory)->get_thread_id = smx_ctx_base_get_thread_id; } - -static smx_context_t smx_ctx_java_self(void) +smx_context_t smx_ctx_java_self(void) { return my_current_context; } -static void* smx_ctx_java_get_data(smx_context_t context) -{ - return context->data; -} - static smx_context_t smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, char **argv, void_pfn_smxprocess_t cleanup_func, void* data) { - XBT_DEBUG("XXXX Create Context\n"); smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1); /* If the user provided a function for the process then use it @@ -73,10 +73,13 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, if (code) { context->super.cleanup_func = cleanup_func; context->jprocess = (jobject) code; - context->jenv = get_current_thread_env(); - jprocess_start(((smx_ctx_java_t) context)->jprocess, - get_current_thread_env()); - }else{ + context->begin = xbt_os_sem_init(0); + context->end = xbt_os_sem_init(0); + context->killed = 0; + context->thread = xbt_os_thread_create(NULL,smx_ctx_java_thread_run,context,NULL); + } + else { + context->thread = NULL; my_current_context = (smx_context_t)context; } context->super.data = data; @@ -84,88 +87,94 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, return (smx_context_t) context; } +static void* smx_ctx_java_thread_run(void *data) { + smx_ctx_java_t context = (smx_ctx_java_t)data; + //Attach the thread to the JVM + JNIEnv *env; + JavaVM *jvm = get_current_vm(); + jint error = (*jvm)->AttachCurrentThread(jvm, (void **) &env, NULL); + xbt_assert((error == JNI_OK), "The thread could not be attached to the JVM"); + context->jenv = get_current_thread_env(); + //Wait for the first scheduling round to happen. + xbt_os_sem_acquire(context->begin); + //Execution of the "run" method. + jmethodID id = jxbt_get_smethod(env, "org/simgrid/msg/Process", "run", "()V"); + xbt_assert( (id != NULL), "Method not found..."); + (*env)->CallVoidMethod(env, context->jprocess, id); + smx_ctx_java_stop((smx_context_t)context); + + return NULL; +} + static void smx_ctx_java_free(smx_context_t context) { - if (context) { - smx_ctx_java_t ctx_java = (smx_ctx_java_t) context; - - if (ctx_java->jprocess) { - jobject jprocess = ctx_java->jprocess; - - ctx_java->jprocess = NULL; - - /* if the java process is alive join it */ - if (jprocess_is_alive(jprocess, get_current_thread_env())) - jprocess_join(jprocess, get_current_thread_env()); - } + if (context) { + smx_ctx_java_t ctx_java = (smx_ctx_java_t) context; + if (ctx_java->thread) { /* We are not in maestro context */ + xbt_os_thread_join(ctx_java->thread, NULL); + xbt_os_sem_destroy(ctx_java->begin); + xbt_os_sem_destroy(ctx_java->end); + } } - smx_ctx_base_free(context); } -static void smx_ctx_java_stop(smx_context_t context) + +void smx_ctx_java_stop(smx_context_t context) { - jobject jprocess = NULL; - XBT_DEBUG("XXXX Context Stop\n"); - - smx_ctx_java_t ctx_java; - - if (context->cleanup_func) - (*(context->cleanup_func)) (context->data); - - ctx_java = (smx_ctx_java_t) context; - - /*FIXME: is this really necessary? Seems to. */ - if (my_current_context->iwannadie) { - XBT_INFO("I wannadie"); - /* The maestro call xbt_context_stop() with an exit code set to one */ - if (ctx_java->jprocess) { - /* if the java process is alive schedule it */ - if (jprocess_is_alive(ctx_java->jprocess, get_current_thread_env())) { - jprocess_schedule(my_current_context); - jprocess = ctx_java->jprocess; - ctx_java->jprocess = NULL; - - /* interrupt the java process */ - jprocess_exit(jprocess, get_current_thread_env()); - } - } - } else { - /* the java process exits */ - jprocess = ctx_java->jprocess; - ctx_java->jprocess = NULL; + smx_ctx_java_t ctx_java = (smx_ctx_java_t)context; + xbt_assert(context == my_current_context, + "The context to stop must be the current one"); + /* I am the current process and I am dying */ + if (ctx_java->killed == 1) { + ctx_java->killed = 0; + JNIEnv *env = get_current_thread_env(); + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledException", bprintf("Process killed :)")); + THROWF(cancel_error, 0, "process cancelled"); } + else { + smx_ctx_base_stop(context); + /* detach the thread and kills it */ + JNIEnv *env = ctx_java->jenv; + (*env)->DeleteGlobalRef(env,ctx_java->jprocess); + JavaVM *jvm = get_current_vm(); + jint error = (*jvm)->DetachCurrentThread(jvm); + xbt_assert((error == JNI_OK), "The thread couldn't be detached."); + xbt_os_sem_release(((smx_ctx_java_t)context)->end); + xbt_os_thread_exit(NULL); - /* delete the global reference associated with the java process */ - jprocess_delete_global_ref(jprocess, get_current_thread_env()); + } } static void smx_ctx_java_suspend(smx_context_t context) { - jprocess_unschedule(context); + smx_ctx_java_t ctx_java = (smx_ctx_java_t) context; + xbt_os_sem_release(ctx_java->end); + xbt_os_sem_acquire(ctx_java->begin); } // FIXME: inline those functions static void smx_ctx_java_resume(smx_context_t new_context) { XBT_DEBUG("XXXX Context Resume\n"); - jprocess_schedule(new_context); + smx_ctx_java_t ctx_java = (smx_ctx_java_t) new_context; + xbt_os_sem_release(ctx_java->begin); + xbt_os_sem_acquire(ctx_java->end); } -static void smx_ctx_java_runall(xbt_dynar_t processes) +static void smx_ctx_java_runall(void) { + xbt_dynar_t processes = SIMIX_process_get_runnable(); XBT_DEBUG("XXXX Run all\n"); smx_process_t process; smx_context_t old_context; unsigned int cursor; - xbt_dynar_foreach(processes, cursor, process) { old_context = my_current_context; my_current_context = SIMIX_process_get_context(process); smx_ctx_java_resume(my_current_context); my_current_context = old_context; } - xbt_dynar_reset(processes); XBT_DEBUG("XXXX End of run all\n"); }