From 5f69a2d25e1b7ad06dac0ab478a7047eebc8eab1 Mon Sep 17 00:00:00 2001 From: Marion Guthmuller Date: Sat, 29 Sep 2012 21:58:20 +0200 Subject: [PATCH] model-checker : move struct s_smx_ctx_sysv in smx_private.h, needed for stacks comparison --- src/simix/smx_context_sysv.c | 9 --------- src/simix/smx_private.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 675879f31a..758f7fed7a 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -25,15 +25,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); -typedef struct s_smx_ctx_sysv { - s_smx_ctx_base_t super; /* Fields of super implementation */ - ucontext_t uc; /* the ucontext that executes the code */ -#ifdef HAVE_VALGRIND_VALGRIND_H - unsigned int valgrind_stack_id; /* the valgrind stack id */ -#endif - char stack[0]; /* the thread stack (must remain the last element of the structure) */ -} s_smx_ctx_sysv_t, *smx_ctx_sysv_t; - #ifdef CONTEXT_THREADS static xbt_parmap_t sysv_parmap; static ucontext_t* sysv_workers_stacks; /* space to save the worker's stack in each thread */ diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 88bd7b7661..9a459cc7ba 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -204,6 +204,16 @@ void SIMIX_context_set_current(smx_context_t context); smx_context_t SIMIX_context_get_current(void); /* All factories init */ + +typedef struct s_smx_ctx_sysv { + s_smx_ctx_base_t super; /* Fields of super implementation */ + ucontext_t uc; /* the ucontext that executes the code */ +#ifdef HAVE_VALGRIND_VALGRIND_H + unsigned int valgrind_stack_id; /* the valgrind stack id */ +#endif + char stack[0]; /* the thread stack (must remain the last element of the structure) */ +} s_smx_ctx_sysv_t, *smx_ctx_sysv_t; + void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory); void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory); void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory); -- 2.20.1