X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b06678c7ab963e7f0a45e3fa86befd2557fcb159..2f7c87c6cd0db3f48434559687fdddeaf07c6f50:/src/smx_context_java.c diff --git a/src/smx_context_java.c b/src/smx_context_java.c index db1eedf5f4..b2abae8739 100644 --- a/src/smx_context_java.c +++ b/src/smx_context_java.c @@ -8,14 +8,14 @@ #include -#include +#include #include "smx_context_java.h" -#include "simix/process_private.h" #include "xbt/dynar.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jmsg, bindings, "MSG for Java(TM)"); -static smx_context_t smx_ctx_java_self(void); +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, @@ -24,11 +24,9 @@ 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); void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory) { @@ -43,14 +41,13 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory) (*factory)->runall = smx_ctx_java_runall; (*factory)->name = "ctx_java_factory"; //(*factory)->finalize = smx_ctx_base_factory_finalize; - (*factory)->self = smx_ctx_base_self; + (*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 void* smx_ctx_java_get_data(smx_context_t context) +smx_context_t smx_ctx_java_self(void) { - return context->data; + return my_current_context; } static smx_context_t @@ -59,7 +56,7 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, void_pfn_smxprocess_t cleanup_func, void* data) { - fprintf(stderr,"XXXX Create Context\n"); + 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 @@ -70,8 +67,9 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc, 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; + } + else { + my_current_context = (smx_context_t)context; } context->super.data = data; @@ -83,55 +81,37 @@ 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) { + if (ctx_java->jprocess) { /* the java process still exists */ 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()); + /* stop it */ + XBT_DEBUG("The process still exists, making it exit now"); + jprocess_exit(jprocess, get_current_thread_env()); + + /* it's dead now, remove it from the JVM */ + jprocess_delete_global_ref(jprocess, get_current_thread_env()); } } 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; - fprintf(stderr,"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 (smx_current_context->iwannadie) { - INFO0("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(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; - } + xbt_assert(context == my_current_context, + "The context to stop must be the current one"); + /* I am the current process and I am dying */ + + smx_ctx_base_stop(context); + + XBT_DEBUG("I am dying"); - /* delete the global reference associated with the java process */ - jprocess_delete_global_ref(jprocess, get_current_thread_env()); + /* suspend myself again, smx_ctx_java_free() will destroy me later + * from maeastro */ + jprocess_unschedule(context); + XBT_DEBUG("Java stop finished"); } static void smx_ctx_java_suspend(smx_context_t context) @@ -142,26 +122,23 @@ 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) { - fprintf(stderr,"XXXX Context Resume\n"); + XBT_DEBUG("XXXX Context Resume\n"); jprocess_schedule(new_context); } -static void smx_ctx_java_runall(xbt_dynar_t processes) +static void smx_ctx_java_runall(void) { - fprintf(stderr,"XXXX Run all\n"); - printf("Affiche les %ld elements\n",xbt_dynar_length(processes)); + 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) { - printf("process_name : %s\n",process->name); - old_context = smx_current_context; - smx_current_context = process->context; - smx_ctx_java_resume(smx_current_context); - smx_current_context = old_context; + 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); - fprintf(stderr,"XXXX End of run all\n"); + XBT_DEBUG("XXXX End of run all\n"); }