Update way to have processes to run from Simgrid 3.7

[simgrid.git] / src / smx_context_java.c

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index ac2f9b6..25db92f 100644 (file)
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -27,8 +27,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_get_data(smx_context_t context);
+static void smx_ctx_java_runall(void);
 
 void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
 {
@@ -45,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)
@@ -53,11 +51,6 @@ 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,
@@ -150,20 +143,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");
 }