X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89f1cc65397f33d62a434e22d4c4a21c6c889f15..5f0a46f004078a0d00c77f430829581d408f526d:/src/smx_context_java.c diff --git a/src/smx_context_java.c b/src/smx_context_java.c index 781f490cd5..26e54ba48f 100644 --- a/src/smx_context_java.c +++ b/src/smx_context_java.c @@ -8,8 +8,20 @@ #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)"); @@ -21,11 +33,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_swag_t processes); - +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 */ @@ -38,6 +49,13 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory) (*factory)->suspend = smx_ctx_java_suspend; (*factory)->runall = smx_ctx_java_runall; (*factory)->name = "ctx_java_factory"; + //(*factory)->finalize = smx_ctx_base_factory_finalize; + (*factory)->self = smx_ctx_java_self; + (*factory)->get_data = smx_ctx_base_get_data; +} +smx_context_t smx_ctx_java_self(void) +{ + return (smx_context_t)xbt_os_thread_get_extra_data(); } static smx_context_t @@ -46,114 +64,126 @@ 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->jenv = get_current_thread_env(); - jprocess_start(((smx_ctx_java_t) context)->jprocess, - get_current_thread_env()); - }else{ - smx_current_context = (smx_context_t)context; + 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; + xbt_os_thread_set_extra_data(context); } context->super.data = data; return (smx_context_t) context; } -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()); - } +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); + 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); + } + 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"); + jdouble startTime = (*env)->GetDoubleField(env, context->jprocess, jprocess_field_Process_startTime); + if (startTime > MSG_get_clock()) { + MSG_process_sleep(startTime - MSG_get_clock()); } + //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); - smx_ctx_base_free(context); + return NULL; } -static void smx_ctx_java_stop(smx_context_t context) +static void smx_ctx_java_free(smx_context_t context) { - jobject jprocess = NULL; - - 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? DIRTY HACK: let's comment it and see*/ -// if (((smx_process_t)smx_current_context->data)->iwannadie) { - /* 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(smx_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; -// } - - /* delete the global reference associated with the java process */ - jprocess_delete_global_ref(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_swap(smx_context_t context) -{ - if (context) { - smx_context_t self = current_context; - - current_context = context; - - jprocess_schedule(context); - current_context = self; +void smx_ctx_java_stop(smx_context_t context) +{ + smx_ctx_java_t ctx_java = (smx_ctx_java_t)context; + /* I am the current process and I am dying */ + if (context->iwannadie == -1) { + 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"); } + 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); - if (current_context->iwannadie) - smx_ctx_java_stop(1); -}*/ + } +} 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) { - 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_swag_t processes) +static void smx_ctx_java_runall(void) { + xbt_dynar_t processes = SIMIX_process_get_runnable(); smx_process_t process; - smx_context_t old_context; - - while ((process = xbt_swag_extract(processes))) { - old_context = smx_current_context; - smx_current_context = SIMIX_process_get_context(process); - smx_ctx_java_resume(smx_current_context); - smx_current_context = old_context; + unsigned int cursor; + xbt_dynar_foreach(processes, cursor, process) { + smx_ctx_java_resume(SIMIX_process_get_context(process)); } }