X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52e6b3073b6d8b88d05b8b2e520c567eb789b09d..d318c9e02308e2c7c66e3fcc06105d96332ebb44:/src/smx_context_java.c diff --git a/src/smx_context_java.c b/src/smx_context_java.c index fd385bb004..91a3b93114 100644 --- a/src/smx_context_java.c +++ b/src/smx_context_java.c @@ -1,6 +1,6 @@ /* context_java - implementation of context switching for java threads */ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009, 2010, 2012. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -13,20 +13,10 @@ #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; -} - - +extern JavaVM *__java_vm; 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_factory_create_context(xbt_main_func_t code, int argc, char **argv, @@ -57,7 +47,7 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory) } smx_context_t smx_ctx_java_self(void) { - return my_current_context; + return (smx_context_t)xbt_os_thread_get_extra_data(); } static smx_context_t @@ -66,21 +56,29 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, void_pfn_smxprocess_t cleanup_func, void* data) { - smx_ctx_java_t context = xbt_new0(s_smx_ctx_java_t, 1); - + 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 otherwise is the context for maestro */ if (code) { - context->super.cleanup_func = cleanup_func; - context->jprocess = (jobject) code; - 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); + if (argc == 0) { + context->jprocess = (jobject) code; + } + else { + context->jprocess = NULL; + } + context->super.cleanup_func = cleanup_func; + context->begin = xbt_os_sem_init(0); + context->end = xbt_os_sem_init(0); + + context->super.argc = argc; + context->super.argv = argv; + context->super.code = code; + + 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; + xbt_os_thread_set_extra_data(context); } context->super.data = data; @@ -89,14 +87,23 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, static void* smx_ctx_java_thread_run(void *data) { smx_ctx_java_t context = (smx_ctx_java_t)data; + xbt_os_thread_set_extra_data(context); //Attach the thread to the JVM JNIEnv *env; - JavaVM *jvm = get_current_vm(); - jint error = (*jvm)->AttachCurrentThread(jvm, (void **) &env, NULL); + jint error = (*__java_vm)->AttachCurrentThread(__java_vm, (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); + //Create the "Process" object if needed. + if (context->super.argc > 0) { + (*(context->super.code))(context->super.argc, context->super.argv); + } + else { + smx_process_t process = SIMIX_process_self(); + (*env)->SetLongField(env, context->jprocess, jprocess_field_Process_bind, (jlong)process); + } + xbt_assert((context->jprocess != NULL), "Process not created..."); //wait for the process to be able to begin //TODO: Cache it jfieldID jprocess_field_Process_startTime = jxbt_get_sfield(env, "org/simgrid/msg/Process", "startTime", "D"); @@ -130,11 +137,9 @@ static void smx_ctx_java_free(smx_context_t context) void smx_ctx_java_stop(smx_context_t context) { 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; + if (context->iwannadie) { + context->iwannadie = 0; JNIEnv *env = get_current_thread_env(); jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process killed :)")); THROWF(cancel_error, 0, "process cancelled"); @@ -144,8 +149,7 @@ void smx_ctx_java_stop(smx_context_t 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); + jint error = (*__java_vm)->DetachCurrentThread(__java_vm); 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); @@ -163,7 +167,6 @@ static void smx_ctx_java_suspend(smx_context_t context) // FIXME: inline those functions static void smx_ctx_java_resume(smx_context_t new_context) { - XBT_DEBUG("XXXX Context Resume\n"); 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); @@ -172,16 +175,9 @@ static void smx_ctx_java_resume(smx_context_t new_context) 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; + smx_ctx_java_resume(SIMIX_process_get_context(process)); } - - XBT_DEBUG("XXXX End of run all\n"); }