X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89f1cc65397f33d62a434e22d4c4a21c6c889f15..1af19bbc84c3dca4a140ce9d189b2c72ddb50bed:/src/smx_context_java.c?ds=sidebyside

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index 781f490cd5..586531d42f 100644
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -10,9 +10,14 @@
 #include <xbt/function_types.h>
 #include <simix/simix.h>
 #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 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,
@@ -24,7 +29,8 @@ 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(xbt_dynar_t processes);
+static void* smx_ctx_java_get_data(smx_context_t context);
 
 void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
 {
@@ -38,6 +44,20 @@ 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;
+  (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
+}
+
+static smx_context_t smx_ctx_java_self(void)
+{
+	return my_current_context;
+}
+
+static void* smx_ctx_java_get_data(smx_context_t context)
+{
+	return context->data;
 }
 
 static smx_context_t
@@ -46,6 +66,7 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc,
                                     void_pfn_smxprocess_t cleanup_func,
                                     void* data)
 {
+  DEBUG0("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
@@ -57,7 +78,7 @@ smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc,
     jprocess_start(((smx_ctx_java_t) context)->jprocess,
                    get_current_thread_env());
   }else{
-    smx_current_context = (smx_context_t)context;
+    my_current_context = (smx_context_t)context;
   }
   context->super.data = data;
   
@@ -86,6 +107,7 @@ static void smx_ctx_java_free(smx_context_t context)
 static void smx_ctx_java_stop(smx_context_t context)
 {
   jobject jprocess = NULL;
+  DEBUG0("XXXX Context Stop\n");
 
   smx_ctx_java_t ctx_java;
 
@@ -94,13 +116,14 @@ static void smx_ctx_java_stop(smx_context_t context)
 
   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) {
+  /*FIXME: is this really necessary? Seems to. */
+  if (my_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_schedule(my_current_context);
         jprocess = ctx_java->jprocess;
         ctx_java->jprocess = NULL;
 
@@ -108,32 +131,16 @@ static void smx_ctx_java_stop(smx_context_t context)
         jprocess_exit(jprocess, get_current_thread_env());
       }
     }
-//  } else {
+  } else {
     /* the java process exits */
-//    jprocess = ctx_java->jprocess;
-//    ctx_java->jprocess = NULL;
-//  }
+    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());
 }
 
-/*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;
-  }
-
-  if (current_context->iwannadie)
-    smx_ctx_java_stop(1);
-}*/
-
 static void smx_ctx_java_suspend(smx_context_t context)
 {
   jprocess_unschedule(context);
@@ -142,18 +149,24 @@ 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)
 {
+  DEBUG0("XXXX Context Resume\n");
   jprocess_schedule(new_context);
 }
 
-static void smx_ctx_java_runall(xbt_swag_t processes)
+static void smx_ctx_java_runall(xbt_dynar_t processes)
 {
+  DEBUG0("XXXX Run all\n");
   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) {
+    old_context = my_current_context;
+    my_current_context = process->context;
+    smx_ctx_java_resume(my_current_context);
+    my_current_context = old_context;
   }
+  xbt_dynar_reset(processes);
+
+  DEBUG0("XXXX End of run all\n");
 }