When exiting a process, replace MSG_process_kill by smx_ctx_java_stop

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9714 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/jmsg.c b/src/jmsg.c
index 2e8c1d5..85ba6f5 100644 (file)
--- a/src/jmsg.c
+++ b/src/jmsg.c
@@ -840,7 +840,6 @@ JNIEXPORT void JNICALL
   jxbt_check_res("MSG_clean()", rv, MSG_OK,
                  bprintf
                  ("unexpected error : MSG_clean() failed .. please report this bug "));
-
 }
 
 JNIEXPORT jint JNICALL
@@ -875,7 +874,7 @@ Java_org_simgrid_msg_MsgNative_processExit(JNIEnv * env, jclass cls,
     return;
   }
 
-  MSG_process_kill(process);
+  smx_ctx_java_stop(MSG_process_get_smx_ctx(process));
 }
 
 JNIEXPORT void JNICALL

diff --git a/src/smx_context_java.c b/src/smx_context_java.c
index cb098f8..ac2f9b6 100644 (file)
--- a/src/smx_context_java.c
+++ b/src/smx_context_java.c
@@ -25,7 +25,6 @@ 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);
@@ -103,11 +102,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;

diff --git a/src/smx_context_java.h b/src/smx_context_java.h
index d801dc3..b970fe0 100644 (file)
--- a/src/smx_context_java.h
+++ b/src/smx_context_java.h
@@ -21,6 +21,7 @@ typedef struct s_smx_ctx_java {
 } s_smx_ctx_java_t, *smx_ctx_java_t;
 
 void SIMIX_ctx_java_factory_init(smx_context_factory_t *factory);
+void smx_ctx_java_stop(smx_context_t context);
 
 SG_END_DECL()