Changed the way current_context is handled in smx_context_java

[simgrid.git] / src / smx_context_java.c

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index 04dd49b..26e54ba 100644 (file)
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -25,8 +25,6 @@ JavaVM *get_current_vm(void)
 
 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 +55,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 +64,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,6 +95,7 @@ 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();
@@ -97,6 +104,18 @@ static void* smx_ctx_java_thread_run(void *data) {
   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...");
@@ -123,11 +142,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 == -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");
@@ -156,7 +173,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);
@@ -165,16 +181,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");
 }