A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Used of tesh for test.
[simgrid.git]
/
src
/
smx_context_java.c
diff --git
a/src/smx_context_java.c
b/src/smx_context_java.c
index
aa2d0c2
..
622e103
100644
(file)
--- a/
src/smx_context_java.c
+++ b/
src/smx_context_java.c
@@
-8,7
+8,7
@@
#include <xbt/function_types.h>
#include <xbt/function_types.h>
-#include <sim
ix
/simix.h>
+#include <sim
grid
/simix.h>
#include "smx_context_java.h"
#include "xbt/dynar.h"
#include "smx_context_java.h"
#include "xbt/dynar.h"
@@
-97,11
+97,13
@@
static void smx_ctx_java_free(smx_context_t context)
smx_ctx_base_free(context);
}
smx_ctx_base_free(context);
}
+
void smx_ctx_java_stop(smx_context_t context)
{
void smx_ctx_java_stop(smx_context_t context)
{
-
xbt_assert(context == my_current_context,
-
"The context to stop must be the current one");
+ xbt_assert(context == my_current_context,
+ "The context to stop must be the current one");
/* I am the current process and I am dying */
/* I am the current process and I am dying */
+
smx_ctx_base_stop(context);
XBT_DEBUG("I am dying");
smx_ctx_base_stop(context);
XBT_DEBUG("I am dying");
@@
-109,7
+111,7
@@
void smx_ctx_java_stop(smx_context_t context)
/* suspend myself again, smx_ctx_java_free() will destroy me later
* from maeastro */
jprocess_unschedule(context);
/* suspend myself again, smx_ctx_java_free() will destroy me later
* from maeastro */
jprocess_unschedule(context);
-
xbt_die("This function was not supposed to return
");
+
XBT_DEBUG("Java stop finished
");
}
static void smx_ctx_java_suspend(smx_context_t context)
}
static void smx_ctx_java_suspend(smx_context_t context)