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
Factorize a lot of code in context factories through a proper object implementation
[simgrid.git]
/
src
/
simix
/
smx_context_sysv.c
diff --git
a/src/simix/smx_context_sysv.c
b/src/simix/smx_context_sysv.c
index
a44593d
..
afa5403
100644
(file)
--- a/
src/simix/smx_context_sysv.c
+++ b/
src/simix/smx_context_sysv.c
@@
-22,10
+22,9
@@
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
typedef struct s_smx_ctx_sysv {
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
typedef struct s_smx_ctx_sysv {
- SMX_CTX_BASE_T;
+ s_smx_ctx_base_t super; /* Fields of super implementation */
ucontext_t uc; /* the thread that execute the code */
char stack[STACK_SIZE]; /* the thread stack size */
ucontext_t uc; /* the thread that execute the code */
char stack[STACK_SIZE]; /* the thread stack size */
- struct s_smx_ctx_sysv *prev; /* the previous process */
#ifdef HAVE_VALGRIND_VALGRIND_H
unsigned int valgrind_stack_id; /* the valgrind stack id */
#endif
#ifdef HAVE_VALGRIND_VALGRIND_H
unsigned int valgrind_stack_id; /* the valgrind stack id */
#endif
@@
-35,25
+34,19
@@
static smx_context_t
smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
void_f_pvoid_t cleanup_func, void* cleanup_arg);
smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
void_f_pvoid_t cleanup_func, void* cleanup_arg);
-static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory);
-
static void smx_ctx_sysv_free(smx_context_t context);
static void smx_ctx_sysv_free(smx_context_t context);
-
static void smx_ctx_sysv_stop(smx_context_t context);
static void smx_ctx_sysv_stop(smx_context_t context);
-
static void smx_ctx_sysv_suspend(smx_context_t context);
static void smx_ctx_sysv_suspend(smx_context_t context);
-
-static void
-smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context);
+static void smx_ctx_sysv_resume(smx_context_t new_context);
static void smx_ctx_sysv_wrapper(void);
static void smx_ctx_sysv_wrapper(void);
-void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
-{
-
*factory = xbt_new0(s_smx_context_factory_t, 1
);
+void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
{
+
+
smx_ctx_base_factory_init(factory
);
(*factory)->create_context = smx_ctx_sysv_factory_create_context;
(*factory)->create_context = smx_ctx_sysv_factory_create_context;
- (*factory)->finalize = smx_ctx_sysv_factory_finalize;
+ /* Do not overload that method (*factory)->finalize */
(*factory)->free = smx_ctx_sysv_free;
(*factory)->stop = smx_ctx_sysv_stop;
(*factory)->suspend = smx_ctx_sysv_suspend;
(*factory)->free = smx_ctx_sysv_free;
(*factory)->stop = smx_ctx_sysv_stop;
(*factory)->suspend = smx_ctx_sysv_suspend;
@@
-61,23
+54,16
@@
void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
(*factory)->name = "smx_sysv_context_factory";
}
(*factory)->name = "smx_sysv_context_factory";
}
-static int smx_ctx_sysv_factory_finalize(smx_context_factory_t * factory)
-{
- free(*factory);
- *factory = NULL;
- return 0;
-}
-
static smx_context_t
smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
void_f_pvoid_t cleanup_func, void* cleanup_arg)
{
static smx_context_t
smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
void_f_pvoid_t cleanup_func, void* cleanup_arg)
{
- smx_ctx_sysv_t context = xbt_new0(s_smx_ctx_sysv_t, 1);
+ smx_ctx_sysv_t context = (smx_ctx_sysv_t)smx_ctx_base_factory_create_context_sized
+ (sizeof(s_smx_ctx_sysv_t), code,argc,argv,cleanup_func,cleanup_arg);
/* If the user provided a function for the process then use it
otherwise is the context for maestro */
if(code){
/* If the user provided a function for the process then use it
otherwise is the context for maestro */
if(code){
- context->code = code;
xbt_assert2(getcontext(&(context->uc)) == 0,
"Error in context saving: %d (%s)", errno, strerror(errno));
xbt_assert2(getcontext(&(context->uc)) == 0,
"Error in context saving: %d (%s)", errno, strerror(errno));
@@
-97,49
+83,28
@@
smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv,
context->uc.uc_stack.ss_size);
#endif /* HAVE_VALGRIND_VALGRIND_H */
context->uc.uc_stack.ss_size);
#endif /* HAVE_VALGRIND_VALGRIND_H */
- context->argc = argc;
- context->argv = argv;
- context->cleanup_func = cleanup_func;
- context->cleanup_arg = cleanup_arg;
-
makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
}
return (smx_context_t)context;
}
makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0);
}
return (smx_context_t)context;
}
-static void smx_ctx_sysv_free(smx_context_t pcontext)
-{
- int i;
- smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext;
+static void smx_ctx_sysv_free(smx_context_t context) {
+
if (context){
#ifdef HAVE_VALGRIND_VALGRIND_H
VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) context)->valgrind_stack_id);
#endif /* HAVE_VALGRIND_VALGRIND_H */
if (context){
#ifdef HAVE_VALGRIND_VALGRIND_H
VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) context)->valgrind_stack_id);
#endif /* HAVE_VALGRIND_VALGRIND_H */
- /* free argv */
- if (context->argv) {
- for (i = 0; i < context->argc; i++)
- if (context->argv[i])
- free(context->argv[i]);
-
- free(context->argv);
- }
-
- /* destroy the context */
- free(context);
}
}
+ smx_ctx_base_free(context);
}
}
-static void smx_ctx_sysv_stop(smx_context_t pcontext)
-{
- smx_ctx_sysv_t context = (smx_ctx_sysv_t)pcontext;
-
- if (context->cleanup_func)
- (*context->cleanup_func) (context->cleanup_arg);
+static void smx_ctx_sysv_stop(smx_context_t context) {
+ smx_ctx_base_stop(context);
- smx_ctx_sysv_suspend(
p
context);
+ smx_ctx_sysv_suspend(context);
}
static void smx_ctx_sysv_wrapper()
}
static void smx_ctx_sysv_wrapper()
@@
-154,33
+119,24
@@
static void smx_ctx_sysv_wrapper()
smx_ctx_sysv_t context =
(smx_ctx_sysv_t)simix_global->current_process->context;
smx_ctx_sysv_t context =
(smx_ctx_sysv_t)simix_global->current_process->context;
- (context->
code) (context->argc, context->
argv);
+ (context->
super.code) (context->super.argc, context->super.
argv);
smx_ctx_sysv_stop((smx_context_t)context);
}
smx_ctx_sysv_stop((smx_context_t)context);
}
-static void smx_ctx_sysv_suspend(smx_context_t context)
-{
- int rv;
-
- smx_ctx_sysv_t prev_context = ((smx_ctx_sysv_t) context)->prev;
-
- ((smx_ctx_sysv_t) context)->prev = NULL;
+static void smx_ctx_sysv_suspend(smx_context_t context) {
+ ucontext_t maestro_ctx = ((smx_ctx_sysv_t)simix_global->maestro_process->context)->uc;
-
rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &prev_context->uc
);
+
int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx
);
xbt_assert0((rv == 0), "Context swapping failure");
}
static void
xbt_assert0((rv == 0), "Context swapping failure");
}
static void
-smx_ctx_sysv_resume(smx_context_t old_context, smx_context_t new_context)
-{
- int rv;
-
- ((smx_ctx_sysv_t) new_context)->prev = (smx_ctx_sysv_t)old_context;
+smx_ctx_sysv_resume(smx_context_t new_context) {
+ smx_ctx_sysv_t maestro = (smx_ctx_sysv_t)simix_global->maestro_process->context;
- rv = swapcontext(&((smx_ctx_sysv_t)old_context)->uc,
- &((smx_ctx_sysv_t)new_context)->uc);
+ int rv = swapcontext(&(maestro->uc), &((smx_ctx_sysv_t)new_context)->uc);
xbt_assert0((rv == 0), "Context swapping failure");
}
xbt_assert0((rv == 0), "Context swapping failure");
}