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_XXX_is_empty() instead of testing xbt_XXX_length() against 0.
[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
cdaa87a
..
2906981
100644
(file)
--- a/
src/simix/smx_context_base.c
+++ b/
src/simix/smx_context_base.c
@@
-1,4
+1,4
@@
-/* context_base - Code factorization ac
c
ross context switching implementations */
+/* context_base - Code factorization across context switching implementations */
/* Copyright (c) 2010. The SimGrid Team.
* All rights reserved. */
/* Copyright (c) 2010. The SimGrid Team.
* All rights reserved. */
@@
-10,6
+10,7
@@
#include "xbt/function_types.h"
#include "simix/simix.h"
#include "simix/context.h"
#include "xbt/function_types.h"
#include "simix/simix.h"
#include "simix/context.h"
+#include "simix/private.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
@@
-26,7
+27,6
@@
void smx_ctx_base_factory_init(smx_context_factory_t *factory)
(*factory)->runall = NULL;
(*factory)->self = smx_ctx_base_self;
(*factory)->get_data = smx_ctx_base_get_data;
(*factory)->runall = NULL;
(*factory)->self = smx_ctx_base_self;
(*factory)->get_data = smx_ctx_base_get_data;
- (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
(*factory)->name = "base context factory";
}
(*factory)->name = "base context factory";
}
@@
-55,8
+55,8
@@
smx_ctx_base_factory_create_context_sized(size_t size,
context->argc = argc;
context->argv = argv;
context->code = code;
context->argc = argc;
context->argv = argv;
context->code = code;
- }
else
{
-
smx_current_context = context
;
+ }
else
{
+
SIMIX_context_set_current(context)
;
}
context->data = data;
}
context->data = data;
@@
-72,8
+72,7
@@
void smx_ctx_base_free(smx_context_t context)
/* free argv */
if (context->argv) {
for (i = 0; i < context->argc; i++)
/* 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,22
+85,17
@@
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;
SIMIX_req_process_cleanup(context->data);
}
smx_context_t smx_ctx_base_self(void)
{
context->iwannadie = 0;
SIMIX_req_process_cleanup(context->data);
}
smx_context_t smx_ctx_base_self(void)
{
- return
smx_current_context
;
+ return
SIMIX_context_get_current()
;
}
void *smx_ctx_base_get_data(smx_context_t context)
{
return context->data;
}
}
void *smx_ctx_base_get_data(smx_context_t context)
{
return context->data;
}
-
-int smx_ctx_base_get_thread_id()
-{
- return 0;
-}