X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/714a970003a5bccec9a46b0a4e0b42b5d980ea2f..edd9023755f5628abe30bdb2745dad951e487e67:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index e67c326be2..9db467f609 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -1,16 +1,16 @@ -/* context_sysv - context switching with ucontextes from System V */ +/* context_sysv - context switching with ucontexts from System V */ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2014. The SimGrid Team. * All rights reserved. */ - /* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ #include #include "xbt/parmap.h" #include "smx_private.h" -#include "gras_config.h" +#include "internal_config.h" #include "context_sysv_config.h" /* loads context system definitions */ #include "mc/mc.h" @@ -32,12 +32,12 @@ typedef struct s_smx_ctx_sysv { #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) */ + char *stack; /* the thread stack */ } 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 */ +static smx_ctx_sysv_t* sysv_workers_context; /* space to save the worker's context in each thread */ static unsigned long sysv_threads_working; /* number of threads that have started their work */ static xbt_os_thread_key_t sysv_worker_id_key; /* thread-specific storage for the thread id */ #endif @@ -46,16 +46,10 @@ static unsigned long sysv_process_index = 0; /* index of the next process to r static smx_ctx_sysv_t sysv_maestro_context; static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory); -static smx_context_t -smx_ctx_sysv_create_context_sized(size_t structure_size, - xbt_main_func_t code, int argc, - char **argv, - void_pfn_smxprocess_t cleanup_func, - void *data); static void smx_ctx_sysv_free(smx_context_t context); static smx_context_t smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, - void_pfn_smxprocess_t cleanup_func, void* data); + void_pfn_smxprocess_t cleanup_func, smx_process_t process); static void smx_ctx_sysv_wrapper(int count, ...); @@ -90,7 +84,8 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) #ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */ int nthreads = SIMIX_context_get_nthreads(); sysv_parmap = xbt_parmap_new(nthreads, SIMIX_context_get_parallel_mode()); - sysv_workers_stacks = xbt_new(ucontext_t, nthreads); + sysv_workers_context = xbt_new(smx_ctx_sysv_t, nthreads); + sysv_maestro_context = NULL; xbt_os_thread_key_create(&sysv_worker_id_key); (*factory)->stop = smx_ctx_sysv_stop_parallel; (*factory)->suspend = smx_ctx_sysv_suspend_parallel; @@ -110,30 +105,31 @@ static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) #ifdef CONTEXT_THREADS if (sysv_parmap) xbt_parmap_destroy(sysv_parmap); - xbt_free(sysv_workers_stacks); + xbt_free(sysv_workers_context); #endif return smx_ctx_base_factory_finalize(factory); } static smx_context_t -smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, - int argc, char **argv, - void_pfn_smxprocess_t cleanup_func, - void *data) +smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, + void_pfn_smxprocess_t cleanup_func, + smx_process_t process) { int ctx_addr[CTX_ADDR_LEN]; smx_ctx_sysv_t context = - (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size, - code, - argc, - argv, - cleanup_func, - data); + (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized( + sizeof(s_smx_ctx_sysv_t), + code, + argc, + argv, + cleanup_func, + process); /* if the user provided a function for the process then use it, otherwise it is the context for maestro */ if (code) { + context->stack = SIMIX_context_stack_new(); getcontext(&(context->uc)); context->uc.uc_link = NULL; @@ -165,27 +161,17 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, sizeof(smx_ctx_sysv_t), sizeof(int), CTX_ADDR_LEN); } } else { - sysv_maestro_context = context; + if (process != NULL && sysv_maestro_context == NULL) + sysv_maestro_context = context; } - if(MC_IS_ENABLED && code) - MC_new_stack_area(context, ((smx_process_t)((smx_context_t)context)->data)->name, &(context->uc)); + if(MC_is_active() && code) + MC_new_stack_area(context, ((smx_context_t)context)->process->name, + &(context->uc), sizeof(s_smx_ctx_sysv_t)); return (smx_context_t) context; } -static smx_context_t -smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, - void_pfn_smxprocess_t cleanup_func, - void *data) -{ - - return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t) + smx_context_stack_size, - code, argc, argv, cleanup_func, - data); - -} - static void smx_ctx_sysv_free(smx_context_t context) { @@ -195,7 +181,7 @@ static void smx_ctx_sysv_free(smx_context_t context) VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) context)->valgrind_stack_id); #endif /* HAVE_VALGRIND_VALGRIND_H */ - + SIMIX_context_stack_delete(((smx_ctx_sysv_t)context)->stack); } smx_ctx_base_free(context); } @@ -289,10 +275,10 @@ static void smx_ctx_sysv_suspend_parallel(smx_context_t context) else { /* all processes were run, go to the barrier */ XBT_DEBUG("No more processes to run"); - next_context = (smx_context_t) sysv_maestro_context; unsigned long worker_id = (unsigned long) xbt_os_thread_get_specific(sysv_worker_id_key); - next_stack = &sysv_workers_stacks[worker_id]; + next_context = (smx_context_t)sysv_workers_context[worker_id]; + next_stack = &((smx_ctx_sysv_t)next_context)->uc; } SIMIX_context_set_current(next_context); @@ -305,7 +291,9 @@ static void smx_ctx_sysv_resume_parallel(smx_process_t first_process) #ifdef CONTEXT_THREADS unsigned long worker_id = __sync_fetch_and_add(&sysv_threads_working, 1); xbt_os_thread_set_specific(sysv_worker_id_key, (void*) worker_id); - ucontext_t* worker_stack = &sysv_workers_stacks[worker_id]; + smx_ctx_sysv_t worker_context = (smx_ctx_sysv_t)SIMIX_context_self(); + sysv_workers_context[worker_id] = worker_context; + ucontext_t* worker_stack = &worker_context->uc; smx_context_t context = first_process->context; SIMIX_context_set_current(context);