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
Use xbt_abort instead of abort.
[simgrid.git]
/
src
/
simix
/
smx_context_base.c
diff --git
a/src/simix/smx_context_base.c
b/src/simix/smx_context_base.c
index
810ef6c
..
8fd10e4
100644
(file)
--- a/
src/simix/smx_context_base.c
+++ b/
src/simix/smx_context_base.c
@@
-8,9
+8,8
@@
#include "xbt/function_types.h"
#include "xbt/function_types.h"
-#include "simix/simix.h"
-#include "simix/context.h"
-#include "simix/private.h"
+#include "simgrid/simix.h"
+#include "smx_private.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
@@
-66,14
+65,12
@@
smx_ctx_base_factory_create_context_sized(size_t size,
void smx_ctx_base_free(smx_context_t context)
{
int i;
void smx_ctx_base_free(smx_context_t context)
{
int i;
-
if (context) {
/* free argv */
if (context->argv) {
for (i = 0; i < context->argc; i++)
if (context) {
/* free argv */
if (context->argv) {
for (i = 0; i < context->argc; i++)
- if (context->argv[i])
- free(context->argv[i]);
+ free(context->argv[i]);
free(context->argv);
}
free(context->argv);
}
@@
-86,9
+83,10
@@
void smx_ctx_base_free(smx_context_t context)
void smx_ctx_base_stop(smx_context_t context)
{
if (context->cleanup_func)
void smx_ctx_base_stop(smx_context_t context)
{
if (context->cleanup_func)
-
(*(context->cleanup_func))
(context->data);
+
context->cleanup_func
(context->data);
context->iwannadie = 0;
context->iwannadie = 0;
- SIMIX_req_process_cleanup(context->data);
+ simcall_process_cleanup(context->data);
+ context->iwannadie = 1;
}
smx_context_t smx_ctx_base_self(void)
}
smx_context_t smx_ctx_base_self(void)