X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1a2e45431d13cdf45ec8b1c91bf7d6ca8377c9d..3b30cfff2510600099c4587ef77ab71fc839a3c7:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 202d4fae0b..f89fb018b6 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -1,142 +1,179 @@ -/* $Id$ */ +/* context_sysv - context switching with ucontextes from System V */ -/* context_sysv - implementation of context switching with ucontextes from Sys V */ +/* Copyright (c) 2009, 2010. The SimGrid Team. + * All rights reserved. */ -/* Copyright (c) 2004-2008 the SimGrid team. All right 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 "smx_context_private.h" -#include "context_sysv_config.h" /* loads context system definitions */ -#include "portable.h" -#include /* context relative declarations */ - -/* lower this if you want to reduce the memory consumption */ -#define STACK_SIZE 128*1024 +#include "smx_context_sysv_private.h" +#include "xbt/threadpool.h" +#include "simix/private.h" #ifdef HAVE_VALGRIND_VALGRIND_H # include -#endif /* HAVE_VALGRIND_VALGRIND_H */ +#endif /* HAVE_VALGRIND_VALGRIND_H */ -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); +#ifdef _XBT_WIN32 +#include "win32_ucontext.h" +#include "win32_ucontext.c" +#else +#include "ucontext.h" +#endif -typedef struct s_smx_ctx_sysv { - 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 */ -#ifdef HAVE_VALGRIND_VALGRIND_H - unsigned int valgrind_stack_id; /* the valgrind stack id */ -#endif -} s_smx_ctx_sysv_t, *smx_ctx_sysv_t; +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); -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 xbt_tpool_t tpool; -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_suspend(smx_context_t context); -static void smx_ctx_sysv_resume(smx_context_t new_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); -static void smx_ctx_sysv_wrapper(void); -void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { +static void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context); +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)->finalize = smx_ctx_sysv_factory_finalize; + (*factory)->create_context = smx_ctx_sysv_create_context; /* 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)->resume = smx_ctx_sysv_resume; (*factory)->name = "smx_sysv_context_factory"; + + if(_surf_parallel_contexts){ + tpool = xbt_tpool_new(2, 10); + (*factory)->runall = smx_ctx_sysv_runall_parallel; + }else{ + (*factory)->runall = smx_ctx_sysv_runall; + } +} + +int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) +{ + if(tpool) + xbt_tpool_destroy(tpool); + return smx_ctx_base_factory_finalize(factory); } -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_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_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); + + smx_ctx_sysv_t context = + (smx_ctx_sysv_t) smx_ctx_base_factory_create_context_sized(size, + code, + argc, + argv, + cleanup_func, + data); /* If the user provided a function for the process then use it otherwise is the context for maestro */ - if(code){ + if (code) { xbt_assert2(getcontext(&(context->uc)) == 0, - "Error in context saving: %d (%s)", errno, strerror(errno)); + "Error in context saving: %d (%s)", errno, + strerror(errno)); context->uc.uc_link = NULL; context->uc.uc_stack.ss_sp = - pth_skaddr_makecontext(context->stack, STACK_SIZE); + pth_skaddr_makecontext(context->stack, CONTEXT_STACK_SIZE); context->uc.uc_stack.ss_size = - pth_sksize_makecontext(context->stack, STACK_SIZE); + pth_sksize_makecontext(context->stack, CONTEXT_STACK_SIZE); #ifdef HAVE_VALGRIND_VALGRIND_H context->valgrind_stack_id = VALGRIND_STACK_REGISTER(context->uc.uc_stack.ss_sp, - ((char *) context->uc.uc_stack.ss_sp) + - context->uc.uc_stack.ss_size); -#endif /* HAVE_VALGRIND_VALGRIND_H */ - - makecontext(&((smx_ctx_sysv_t)context)->uc, smx_ctx_sysv_wrapper, 0); + ((char *) context->uc.uc_stack.ss_sp) + + context->uc.uc_stack.ss_size); +#endif /* HAVE_VALGRIND_VALGRIND_H */ + + makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper, + sizeof(void*)/sizeof(int), context); + }else{ + maestro_context = context; } - return (smx_context_t)context; + return (smx_context_t) context; + } -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) +{ + + return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t), + code, argc, argv, cleanup_func, + data); + +} - if (context){ +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 */ + VALGRIND_STACK_DEREGISTER(((smx_ctx_sysv_t) + context)->valgrind_stack_id); +#endif /* HAVE_VALGRIND_VALGRIND_H */ } smx_ctx_base_free(context); } -static void smx_ctx_sysv_stop(smx_context_t context) { +void smx_ctx_sysv_stop(smx_context_t context) +{ smx_ctx_base_stop(context); - smx_ctx_sysv_suspend(context); } -static void smx_ctx_sysv_wrapper() -{ - /*FIXME: I would like to avoid accessing simix_global to get the current - context by passing it as an argument of the wrapper function. The problem - is that this function is called from smx_ctx_sysv_start, and uses - makecontext for calling it, and the stupid posix specification states that - all the arguments of the function should be int(32 bits), making it useless - in 64-bit architectures where pointers are 64 bit long. - */ - smx_ctx_sysv_t context = - (smx_ctx_sysv_t)simix_global->current_process->context; - +void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context) +{ (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) { - ucontext_t maestro_ctx = ((smx_ctx_sysv_t)simix_global->maestro_process->context)->uc; - - int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx); +void smx_ctx_sysv_suspend(smx_context_t context) +{ + smx_current_context = (smx_context_t)maestro_context; + int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_context->uc); xbt_assert0((rv == 0), "Context swapping failure"); } -static void -smx_ctx_sysv_resume(smx_context_t new_context) { - smx_ctx_sysv_t maestro = (smx_ctx_sysv_t)simix_global->maestro_process->context; - - int rv = swapcontext(&(maestro->uc), &((smx_ctx_sysv_t)new_context)->uc); +void smx_ctx_sysv_resume(smx_context_t context) +{ + smx_current_context = context; + int rv = swapcontext(&maestro_context->uc, &((smx_ctx_sysv_t) context)->uc); xbt_assert0((rv == 0), "Context swapping failure"); } + +void smx_ctx_sysv_runall(xbt_swag_t processes) +{ + smx_process_t process; + + while ((process = xbt_swag_extract(processes))) + smx_ctx_sysv_resume(process->context); +} + +void smx_ctx_sysv_runall_parallel(xbt_swag_t processes) +{ + smx_process_t process; + while((process = xbt_swag_extract(processes))){ + xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume, process->context); + } +}