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

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index 586531d42f..25db92f1ac 100644
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -10,7 +10,6 @@
 #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)");
@@ -26,11 +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_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)
 {
@@ -47,7 +44,6 @@ void SIMIX_ctx_java_factory_init(smx_context_factory_t * 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)
@@ -55,18 +51,13 @@ 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
 smx_ctx_java_factory_create_context(xbt_main_func_t code, int argc,
                                     char **argv,
                                     void_pfn_smxprocess_t cleanup_func,
                                     void* data)
 {
-  DEBUG0("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
@@ -104,21 +95,20 @@ 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;
-  DEBUG0("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 (my_current_context->iwannadie) {
-    INFO0("I wannadie");
+    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 */
@@ -149,24 +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)
 {
-  DEBUG0("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)
 {
-  DEBUG0("XXXX Run all\n");
+  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 = process->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);
 
-  DEBUG0("XXXX End of run all\n");
+  XBT_DEBUG("XXXX End of run all\n");
 }