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
add getter/setter functions in simix to access more cleanly the process associated...
[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
c28c3c3
..
8fd10e4
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. */
@@
-8,8
+8,8
@@
#include "xbt/function_types.h"
#include "xbt/function_types.h"
-#include "sim
ix
/simix.h"
-#include "s
imix/context
.h"
+#include "sim
grid
/simix.h"
+#include "s
mx_private
.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings);
@@
-26,7
+26,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";
}
@@
-47,16
+46,16
@@
smx_ctx_base_factory_create_context_sized(size_t size,
{
smx_context_t context = xbt_malloc0(size);
{
smx_context_t context = xbt_malloc0(size);
- /* If the user provided a function for the process then use it
-
otherwise
is the context for maestro and we should set it as the
+ /* If the user provided a function for the process then use it
.
+
Otherwise, it
is the context for maestro and we should set it as the
current context */
if (code) {
context->cleanup_func = cleanup_func;
context->argc = argc;
context->argv = argv;
context->code = code;
current context */
if (code) {
context->cleanup_func = cleanup_func;
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;
@@
-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,21
+83,18
@@
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);
- SIMIX_req_process_cleanup(context->data);
+ context->cleanup_func(context->data);
+ context->iwannadie = 0;
+ simcall_process_cleanup(context->data);
+ context->iwannadie = 1;
}
smx_context_t smx_ctx_base_self(void)
{
}
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;
-}