X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa9f958be79c0b5e4cc3bdb20dc6827df6c0a72f..4c9eb13153d917c1a427de998dd68dc837a4e56a:/src/smx_context_java.c

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index cb098f8d9f..fc0af4e173 100644
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -25,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);
 
 void SIMIX_ctx_java_factory_init(smx_context_factory_t * factory)
 {
@@ -46,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)
@@ -54,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,
@@ -103,11 +95,13 @@ 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;
   XBT_DEBUG("XXXX Context Stop\n");
 
+  smx_ctx_base_stop(context);
+
   smx_ctx_java_t ctx_java;
 
   ctx_java = (smx_ctx_java_t) context;
@@ -162,7 +156,6 @@ static void smx_ctx_java_runall(xbt_dynar_t processes)
     smx_ctx_java_resume(my_current_context);
     my_current_context = old_context;
   }
-  xbt_dynar_reset(processes);
 
   XBT_DEBUG("XXXX End of run all\n");
 }