X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3380508146140719d92620cd9bfb801e39a8b9c4..a361c6f643b5c93bf65deaff643fb79144ef965d:/src/smx_context_java.c

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index 15a1cf7a98..b2abae8739 100644
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -8,7 +8,7 @@
 
 
 #include <xbt/function_types.h>
-#include <simix/simix.h>
+#include <simgrid/simix.h>
 #include "smx_context_java.h"
 #include "xbt/dynar.h"
 
@@ -16,7 +16,6 @@ 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,
@@ -27,7 +26,7 @@ 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_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_runall(void);
 
 void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
 {
@@ -46,7 +45,7 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
   (*factory)->get_data = smx_ctx_base_get_data;
 }
 
-static smx_context_t smx_ctx_java_self(void)
+smx_context_t smx_ctx_java_self(void)
 {
 	return my_current_context;
 }
@@ -68,7 +67,8 @@ 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{
+  }
+  else {
     my_current_context = (smx_context_t)context;
   }
   context->super.data = data;
@@ -81,54 +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);
 }
 
+
 void smx_ctx_java_stop(smx_context_t context)
 {
-  jobject jprocess = NULL;
-  XBT_DEBUG("XXXX Context Stop\n");
-
+ 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);
 
-  smx_ctx_java_t ctx_java;
-
-  ctx_java = (smx_ctx_java_t) context;
+  XBT_DEBUG("I am dying");
 
-  /*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;
-  }
-
-  /* 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)
@@ -143,20 +126,19 @@ static void smx_ctx_java_resume(smx_context_t new_context)
   jprocess_schedule(new_context);
 }
 
-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");
 }