From: Christophe Thiéry Date: Tue, 6 Dec 2011 14:47:39 +0000 (+0100) Subject: Remove a useless private header and rename variables X-Git-Tag: exp_20120216~240^2~4 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/09a6c2a0a7bb442da5487755964e9794eaee68cb Remove a useless private header and rename variables --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 4708dd7f6b..b0e7ca8895 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -692,7 +692,6 @@ set(add_src_files src/smpi/smpif2c.in src/smpi/smpiff.in src/smpi/smpirun.in - src/simix/smx_context_sysv_private.h ) file(GLOB_RECURSE xml_files diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index 19a07cf732..c5aec4a9bd 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -30,7 +30,7 @@ typedef struct s_smx_ctx_raw { #ifdef CONTEXT_THREADS static xbt_parmap_t raw_parmap; -static raw_stack_t* raw_local_maestro_stacks; /* space to save maestro's stack in each thread */ +static raw_stack_t* raw_workers_stacks; /* space to save the worker stack in each thread */ #endif static unsigned long raw_process_index = 0; /* index of the next process to run in the @@ -226,7 +226,7 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory) #ifdef CONTEXT_THREADS int nthreads = SIMIX_context_get_nthreads(); raw_parmap = xbt_parmap_new(nthreads); - raw_local_maestro_stacks = xbt_new(raw_stack_t, nthreads); + raw_workers_stacks = xbt_new(raw_stack_t, nthreads); #endif if (SIMIX_context_get_parallel_threshold() > 1) { /* choose dynamically */ @@ -259,7 +259,7 @@ static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory) #ifdef CONTEXT_THREADS if (raw_parmap) xbt_parmap_destroy(raw_parmap); - xbt_free(raw_local_maestro_stacks); + xbt_free(raw_workers_stacks); #endif return smx_ctx_base_factory_finalize(factory); } @@ -464,7 +464,7 @@ static void smx_ctx_raw_suspend_parallel(smx_context_t context) XBT_DEBUG("No more processes to run"); next_context = (smx_context_t) raw_maestro_context; unsigned long worker_id = xbt_parmap_get_worker_id(raw_parmap); - next_stack = raw_local_maestro_stacks[worker_id]; + next_stack = raw_workers_stacks[worker_id]; } SIMIX_context_set_current(next_context); @@ -476,11 +476,11 @@ static void smx_ctx_raw_resume_parallel(smx_process_t first_process) { #ifdef CONTEXT_THREADS unsigned long worker_id = xbt_parmap_get_worker_id(raw_parmap); - raw_stack_t* local_maestro_stack = &raw_local_maestro_stacks[worker_id]; + raw_stack_t* worker_stack = &raw_workers_stacks[worker_id]; smx_context_t context = first_process->context; SIMIX_context_set_current(context); - raw_swapcontext(local_maestro_stack, ((smx_ctx_raw_t) context)->stack_top); + raw_swapcontext(worker_stack, ((smx_ctx_raw_t) context)->stack_top); #endif } diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c index 8bcc0cf5a6..ffd96262cc 100644 --- a/src/simix/smx_context_sysv.c +++ b/src/simix/smx_context_sysv.c @@ -8,32 +8,50 @@ #include -#include "smx_context_sysv_private.h" #include "xbt/parmap.h" #include "simix/private.h" #include "gras_config.h" - -#ifdef HAVE_VALGRIND_VALGRIND_H -# include -#endif /* HAVE_VALGRIND_VALGRIND_H */ +#include "context_sysv_config.h" /* loads context system definitions */ #ifdef _XBT_WIN32 -#include "win32_ucontext.h" +# include /* context relative declarations */ #else -#include "ucontext.h" +# include /* context relative declarations */ #endif +#ifdef HAVE_VALGRIND_VALGRIND_H +# include +#endif /* HAVE_VALGRIND_VALGRIND_H */ + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); -#ifdef CONTEXT_THREADS -static xbt_parmap_t smx_ctx_sysv_parmap; -static ucontext_t* smx_ctx_sysv_local_maestro_uc; /* space to save maestro's stack in each thread */ +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 -static unsigned long smx_ctx_sysv_process_index = 0; /* index of the next process to run in the - * list of runnable processes */ -static smx_ctx_sysv_t smx_ctx_sysv_maestro_context; + 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 */ +#endif +static unsigned long sysv_process_index = 0; /* index of the next process to run in the + * list of runnable processes */ +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 int smx_ctx_sysv_get_thread_id(void); +static smx_context_t smx_ctx_sysv_self_parallel(void); 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); @@ -50,7 +68,6 @@ static void smx_ctx_sysv_suspend_parallel(smx_context_t context); static void smx_ctx_sysv_resume_parallel(smx_process_t first_process); static void smx_ctx_sysv_runall_parallel(void); - /* This is a bit paranoid about SIZEOF_VOIDP not being a multiple of SIZEOF_INT, * but it doesn't harm. */ #define CTX_ADDR_LEN (SIZEOF_VOIDP / SIZEOF_INT + !!(SIZEOF_VOIDP % SIZEOF_INT)) @@ -80,8 +97,8 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) if (SIMIX_context_is_parallel()) { #ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */ int nthreads = SIMIX_context_get_nthreads(); - smx_ctx_sysv_parmap = xbt_parmap_new(nthreads); - smx_ctx_sysv_local_maestro_uc = xbt_new(ucontext_t, nthreads); + sysv_parmap = xbt_parmap_new(nthreads); + sysv_workers_stacks = xbt_new(ucontext_t, nthreads); (*factory)->stop = smx_ctx_sysv_stop_parallel; (*factory)->suspend = smx_ctx_sysv_suspend_parallel; (*factory)->runall = smx_ctx_sysv_runall_parallel; @@ -95,17 +112,17 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory) } } -int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) +static int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory) { #ifdef CONTEXT_THREADS - if (smx_ctx_sysv_parmap) - xbt_parmap_destroy(smx_ctx_sysv_parmap); - xbt_free(smx_ctx_sysv_local_maestro_uc); + if (sysv_parmap) + xbt_parmap_destroy(sysv_parmap); + xbt_free(sysv_workers_stacks); #endif return smx_ctx_base_factory_finalize(factory); } -smx_context_t +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, @@ -144,7 +161,7 @@ smx_ctx_sysv_create_context_sized(size_t size, xbt_main_func_t code, makecontext(&context->uc, (void (*)())smx_ctx_sysv_wrapper, CTX_ADDR_LEN, CTX_ADDR_SPLIT(ctx_addr)); } else { - smx_ctx_sysv_maestro_context = context; + sysv_maestro_context = context; } return (smx_context_t) context; @@ -162,7 +179,7 @@ smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv, } -void smx_ctx_sysv_free(smx_context_t context) +static void smx_ctx_sysv_free(smx_context_t context) { if (context) { @@ -176,7 +193,7 @@ void smx_ctx_sysv_free(smx_context_t context) smx_ctx_base_free(context); } -void smx_ctx_sysv_wrapper(int first, ...) +static void smx_ctx_sysv_wrapper(int first, ...) { union u_ctx_addr ctx_addr; smx_ctx_sysv_t context; @@ -206,7 +223,7 @@ static void smx_ctx_sysv_suspend_serial(smx_context_t context) { /* determine the next context */ smx_context_t next_context; - unsigned long int i = smx_ctx_sysv_process_index++; + unsigned long int i = sysv_process_index++; if (i < xbt_dynar_length(simix_global->process_to_run)) { /* execute the next process */ @@ -217,7 +234,7 @@ static void smx_ctx_sysv_suspend_serial(smx_context_t context) else { /* all processes were run, return to maestro */ XBT_DEBUG("No more process to run"); - next_context = (smx_context_t) smx_ctx_sysv_maestro_context; + next_context = (smx_context_t) sysv_maestro_context; } SIMIX_context_set_current(next_context); swapcontext(&((smx_ctx_sysv_t) context)->uc, @@ -228,7 +245,7 @@ static void smx_ctx_sysv_resume_serial(smx_process_t first_process) { smx_context_t context = first_process->context; SIMIX_context_set_current(context); - swapcontext(&smx_ctx_sysv_maestro_context->uc, + swapcontext(&sysv_maestro_context->uc, &((smx_ctx_sysv_t) context)->uc); } @@ -237,7 +254,7 @@ static void smx_ctx_sysv_runall_serial(void) if (!xbt_dynar_is_empty(simix_global->process_to_run)) { smx_process_t first_process = xbt_dynar_get_as(simix_global->process_to_run, 0, smx_process_t); - smx_ctx_sysv_process_index = 1; + sysv_process_index = 1; /* execute the first process */ smx_ctx_sysv_resume_serial(first_process); @@ -254,7 +271,7 @@ static void smx_ctx_sysv_suspend_parallel(smx_context_t context) { #ifdef CONTEXT_THREADS /* determine the next context */ - smx_process_t next_work = xbt_parmap_next(smx_ctx_sysv_parmap); + smx_process_t next_work = xbt_parmap_next(sysv_parmap); smx_context_t next_context; ucontext_t* next_uc; @@ -267,9 +284,9 @@ 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) smx_ctx_sysv_maestro_context; - unsigned long worker_id = xbt_parmap_get_worker_id(smx_ctx_sysv_parmap); - next_uc = &smx_ctx_sysv_local_maestro_uc[worker_id]; + next_context = (smx_context_t) sysv_maestro_context; + unsigned long worker_id = xbt_parmap_get_worker_id(sysv_parmap); + next_uc = &sysv_workers_stacks[worker_id]; } SIMIX_context_set_current(next_context); @@ -280,19 +297,19 @@ static void smx_ctx_sysv_suspend_parallel(smx_context_t context) static void smx_ctx_sysv_resume_parallel(smx_process_t first_process) { #ifdef CONTEXT_THREADS - unsigned long worker_id = xbt_parmap_get_worker_id(smx_ctx_sysv_parmap); - ucontext_t* local_maestro_uc = &smx_ctx_sysv_local_maestro_uc[worker_id]; + unsigned long worker_id = xbt_parmap_get_worker_id(sysv_parmap); + ucontext_t* worker_stack = &sysv_workers_stacks[worker_id]; smx_context_t context = first_process->context; SIMIX_context_set_current(context); - swapcontext(local_maestro_uc, &((smx_ctx_sysv_t) context)->uc); + swapcontext(worker_stack, &((smx_ctx_sysv_t) context)->uc); #endif } static void smx_ctx_sysv_runall_parallel(void) { #ifdef CONTEXT_THREADS - xbt_parmap_apply(smx_ctx_sysv_parmap, (void_f_pvoid_t) smx_ctx_sysv_resume_parallel, + xbt_parmap_apply(sysv_parmap, (void_f_pvoid_t) smx_ctx_sysv_resume_parallel, simix_global->process_to_run); #endif } diff --git a/src/simix/smx_context_sysv_private.h b/src/simix/smx_context_sysv_private.h deleted file mode 100644 index d829422898..0000000000 --- a/src/simix/smx_context_sysv_private.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Functions of sysv context mecanism: lua inherites them */ - -/* Copyright (c) 2010. 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. */ - -#ifndef _XBT_CONTEXT_SYSV_PRIVATE_H -#define _XBT_CONTEXT_SYSV_PRIVATE_H - -#include "xbt/swag.h" -#include "simix/context.h" -#include "portable.h" - -SG_BEGIN_DECL() - -/* lower this if you want to reduce the memory consumption */ -#include "context_sysv_config.h" /* loads context system definitions */ -#ifdef _XBT_WIN32 -#include /* context relative declarations */ -#else -#include /* context relative declarations */ -#endif - -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_sysv_factory_init(smx_context_factory_t *factory); -int smx_ctx_sysv_factory_finalize(smx_context_factory_t *factory); - -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); -void smx_ctx_sysv_free(smx_context_t context); -int smx_ctx_sysv_get_thread_id(void); -smx_context_t smx_ctx_sysv_self_parallel(void); - -SG_END_DECL() - -#endif /* !_XBT_CONTEXT_SYSV_PRIVATE_H */ diff --git a/src/xbt/parmap.c b/src/xbt/parmap.c index 25de341a47..c40fa0d941 100644 --- a/src/xbt/parmap.c +++ b/src/xbt/parmap.c @@ -102,7 +102,7 @@ void xbt_parmap_destroy(xbt_parmap_t parmap) */ void xbt_parmap_apply(xbt_parmap_t parmap, void_f_pvoid_t fun, xbt_dynar_t data) { - /* Assign resources to worker threads*/ + /* Assign resources to worker threads */ parmap->fun = fun; parmap->data = data; parmap->index = 0; @@ -150,7 +150,7 @@ static void *xbt_parmap_worker_main(void *arg) xbt_os_thread_set_extra_data((void*) (unsigned long) worker_id); XBT_DEBUG("New worker thread created (%u)", worker_id); - + /* Worker's main loop */ while (1) { xbt_parmap_wait(parmap); @@ -301,7 +301,7 @@ XBT_TEST_UNIT("basic", test_parmap_basic, "Basic usage") /* Create the parallel map */ parmap = xbt_parmap_new(10); - for(j = 0; j < 100; j++) { + for (j = 0; j < 100; j++) { xbt_dynar_push_as(data, void *, (void *)j); }