X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30769c28f7021367f7d7f54e868dde6c2c17c050..fc000fcf61f734006d253abb7cb336882e00b6b0:/src/smx_context_java.c

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index 9d654da2b9..25db92f1ac 100644
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -10,9 +10,13 @@
 #include <xbt/function_types.h>
 #include <simix/simix.h>
 #include "smx_context_java.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,
@@ -21,10 +25,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_swag_t processes);
+static void smx_ctx_java_runall(void);
 
 void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
 {
@@ -36,8 +39,16 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
   (*factory)->free = smx_ctx_java_free;
   (*factory)->stop = smx_ctx_java_stop;
   (*factory)->suspend = smx_ctx_java_suspend;
-  (*factory)->runall = (smx_pfn_context_runall_t)smx_ctx_java_runall;
+  (*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;
+}
+
+static smx_context_t smx_ctx_java_self(void)
+{
+	return my_current_context;
 }
 
 static smx_context_t
@@ -46,7 +57,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
@@ -58,7 +69,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;
   
@@ -84,26 +95,25 @@ static void smx_ctx_java_free(smx_context_t context)
   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");
+  XBT_DEBUG("XXXX Context Stop\n");
 
-  smx_ctx_java_t ctx_java;
+  smx_ctx_base_stop(context);
 
-  if (context->cleanup_func)
-    (*(context->cleanup_func)) (context->data);
+  smx_ctx_java_t ctx_java;
 
   ctx_java = (smx_ctx_java_t) context;
 
   /*FIXME: is this really necessary? Seems to. */
-  if (smx_current_context->iwannadie) {
-    INFO0("I wannadie");
+  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(smx_current_context);
+        jprocess_schedule(my_current_context);
         jprocess = ctx_java->jprocess;
         ctx_java->jprocess = NULL;
 
@@ -129,21 +139,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_swag_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;
-  fprintf(stderr,"XXXX Run all\n");
-
-  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 = SIMIX_process_get_context(process);
+    smx_ctx_java_resume(my_current_context);
+    my_current_context = old_context;
   }
-  fprintf(stderr,"XXXX End of run all\n");
+
+  XBT_DEBUG("XXXX End of run all\n");
 }