missing files - adrien

diff --git a/src/bindings/java/smx_context_java.c b/src/bindings/java/smx_context_java.c
index bb36804..9b74b89 100644 (file)
--- a/src/bindings/java/smx_context_java.c
+++ b/src/bindings/java/smx_context_java.c
@@ -155,9 +155,8 @@ void smx_ctx_java_stop(smx_context_t context)
     JNIEnv *env = get_current_thread_env();
     XBT_DEBUG("Gonnal launch Killed Error");
     jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", xbt_strdup("Process killed :)"));
-    // TODO emptty/adsein, comment the following line. This avoid to raise process cancelled exception at the Java level but 
-    // it impacts the shutdown of VMs :( see java-cloud example
-       THROWF(cancel_error, 0, "process cancelled");
+    XBT_DEBUG("Trigger a cancel error at the C level");
+    THROWF(cancel_error, 0, "process cancelled");
   } else {
     smx_ctx_base_stop(context);
     /* detach the thread and kills it */

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 84bcef1..8d2320a 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -759,7 +759,7 @@ void SIMIX_post_process_sleep(smx_action_t action)
     switch(surf_action_get_state(action->sleep.surf_sleep)){
       case SURF_ACTION_FAILED:
         simcall->issuer->context->iwannadie = 1;
-       //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
+        //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
         state = SIMIX_SRC_HOST_FAILURE;
         break;
 
@@ -840,7 +840,6 @@ void SIMIX_process_yield(smx_process_t self)
   if (self->context->iwannadie){
     XBT_DEBUG("I wanna die!");
     SIMIX_process_stop(self);
-    XBT_DEBUG("SIMIX Stop done");
   }
 
   if (self->suspended) {