X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6a397ff4796b51612a295c39ce1f762ea9933e6..ef55efeefd6d977830776142370f5e26ee2d23f6:/src/simix/smx_context_sysv.c diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index afa54030fe..8def97a56d 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -1,43 +1,32 @@ -/* $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 "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" #ifdef HAVE_VALGRIND_VALGRIND_H # include #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, +smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char** argv, void_f_pvoid_t cleanup_func, void* cleanup_arg); -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 void smx_ctx_sysv_wrapper(void); @@ -45,7 +34,7 @@ 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_create_context; /* Do not overload that method (*factory)->finalize */ (*factory)->free = smx_ctx_sysv_free; (*factory)->stop = smx_ctx_sysv_stop; @@ -54,12 +43,12 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) { (*factory)->name = "smx_sysv_context_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_f_pvoid_t cleanup_func, void* cleanup_arg) { + 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); + (size, 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 */ @@ -71,10 +60,10 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, 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 = @@ -87,9 +76,19 @@ smx_ctx_sysv_factory_create_context(xbt_main_func_t code, int argc, char** argv, } return (smx_context_t)context; + +} + +static smx_context_t +smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char** argv, + void_f_pvoid_t cleanup_func, void* cleanup_arg) { + + return smx_ctx_sysv_create_context_sized(sizeof(s_smx_ctx_sysv_t), + code,argc,argv,cleanup_func,cleanup_arg); + } -static void smx_ctx_sysv_free(smx_context_t context) { +void smx_ctx_sysv_free(smx_context_t context) { if (context){ @@ -101,14 +100,13 @@ static void smx_ctx_sysv_free(smx_context_t context) { 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() -{ +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 @@ -124,7 +122,7 @@ static void smx_ctx_sysv_wrapper() smx_ctx_sysv_stop((smx_context_t)context); } -static void smx_ctx_sysv_suspend(smx_context_t context) { +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); @@ -132,8 +130,7 @@ static void smx_ctx_sysv_suspend(smx_context_t context) { xbt_assert0((rv == 0), "Context swapping failure"); } -static void -smx_ctx_sysv_resume(smx_context_t new_context) { +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);