X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1da99cb4dcc64cf3993af474abf27399722aa09a..6760cb07d6b57be16928d95339d71e57c4e24f36:/src/gras/Virtu/sg_emul.c diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c index 6d70e51c31..b6d371ffc7 100644 --- a/src/gras/Virtu/sg_emul.c +++ b/src/gras/Virtu/sg_emul.c @@ -1,91 +1,129 @@ -/* $Id$ */ - /* sg_emul - Emulation support (simulation) */ -/* Copyright (c) 2003-5 Arnaud Legrand, Martin Quinson. All rights reserved.*/ +/* Copyright (c) 2005, 2006, 2007, 2009, 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. */ +#include /* sprintf */ #include "gras/emul.h" #include "gras/Virtu/virtu_sg.h" #include "gras_modinter.h" -#include "xbt/xbt_portability.h" /* timers */ +#include "xbt/xbt_os_time.h" /* timers */ #include "xbt/dict.h" +#include "xbt/ex.h" + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_virtu_emul, gras_virtu, + "Emulation support"); +/*** CPU burning */ +void gras_cpu_burn(double flops) { + smx_action_t act; + smx_cond_t cond; + smx_mutex_t mutex; + + if (flops>0) { + cond = SIMIX_cond_init(); + mutex = SIMIX_mutex_init(); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(emul,gras,"Emulation support"); + SIMIX_mutex_lock(mutex); + act = + SIMIX_action_execute(SIMIX_host_self(), "task", flops); + SIMIX_register_action_to_condition(act, cond); + SIMIX_cond_wait(cond, mutex); + SIMIX_unregister_action_to_condition(act, cond); + + SIMIX_action_destroy(act); + SIMIX_mutex_unlock(mutex); + + SIMIX_cond_destroy(cond); + SIMIX_mutex_destroy(mutex); + } +} /*** Timing macros ***/ static xbt_os_timer_t timer; static int benchmarking = 0; static xbt_dict_t benchmark_set = NULL; -static double reference = .00523066250047108838; /* FIXME: we should benchmark host machine to set this */ +static double reference = .00000000523066250047108838; /* FIXME: we should benchmark host machine to set this; unit=s/flop */ static double duration = 0.0; -static char* locbuf = NULL; -static int locbufsize; +static char *locbuf = NULL; +static unsigned int locbufsize; + +void gras_emul_init(void) +{ + if (!benchmark_set) { + benchmark_set = xbt_dict_new(); + timer = xbt_os_timer_new(); + } +} + +void gras_emul_exit(void) +{ + if (locbuf) + free(locbuf); + xbt_dict_free(&benchmark_set); + xbt_os_timer_free(timer); +} + static void store_in_dict(xbt_dict_t dict, const char *key, double value) { - double *ir = NULL; + double *ir; - xbt_dict_get(dict, key, (void *) &ir); + ir = xbt_dict_get_or_null(dict, key); if (!ir) { - ir = xbt_new0(double,1); - xbt_dict_set(dict, key, ir, free); + ir = xbt_new0(double, 1); + xbt_dict_set(dict, key, ir, xbt_free_f); } *ir = value; } static double get_from_dict(xbt_dict_t dict, const char *key) { - double *ir = NULL; - - xbt_dict_get(dict, key, (void *) &ir); + double *ir = xbt_dict_get(dict, key); return *ir; } -int gras_bench_always_begin(const char *location,int line) +int gras_bench_always_begin(const char *location, int line) { - xbt_assert0(!benchmarking,"Already benchmarking"); + xbt_assert0(!benchmarking, "Already benchmarking"); benchmarking = 1; if (!timer) - xbt_os_timer_start(timer); + xbt_os_timer_start(timer); return 0; } -int gras_bench_always_end(void) -{ - m_task_t task = NULL; - - xbt_assert0(benchmarking,"Not benchmarking yet"); +int gras_bench_always_end(void) { + xbt_assert0(benchmarking, "Not benchmarking yet"); benchmarking = 0; xbt_os_timer_stop(timer); duration = xbt_os_timer_elapsed(timer); - task = MSG_task_create("task", (duration)/reference, 0 , NULL); - MSG_task_execute(task); - MSG_task_destroy(task); + + gras_cpu_burn(duration/reference); + return 0; } -int gras_bench_once_begin(const char *location,int line) +int gras_bench_once_begin(const char *location, int line) { double *ir = NULL; - xbt_assert0(!benchmarking,"Already benchmarking"); + xbt_assert0(!benchmarking, "Already benchmarking"); benchmarking = 1; if (!locbuf || locbufsize < strlen(location) + 64) { - locbufsize = strlen(location) + 64; - locbuf = xbt_realloc(locbuf,locbufsize); + locbufsize = strlen(location) + 64; + locbuf = xbt_realloc(locbuf, locbufsize); } - sprintf(locbuf,"%s:%d",location, line); - - xbt_dict_get(benchmark_set, locbuf, (void *) &ir); - if(!ir) { - DEBUG1("%s",locbuf); + sprintf(locbuf, "%s:%d", location, line); + + ir = xbt_dict_get_or_null(benchmark_set, locbuf); + if (!ir) { + DEBUG1("%s", locbuf); duration = 1; xbt_os_timer_start(timer); return 1; @@ -95,48 +133,30 @@ int gras_bench_once_begin(const char *location,int line) } } -int gras_bench_once_end(void) -{ - m_task_t task = NULL; - - xbt_assert0(benchmarking,"Not benchmarking yet"); +int gras_bench_once_end(void) { + xbt_assert0(benchmarking, "Not benchmarking yet"); benchmarking = 0; - if(duration>0) { + if (duration > 0) { xbt_os_timer_stop(timer); duration = xbt_os_timer_elapsed(timer); store_in_dict(benchmark_set, locbuf, duration); } else { - duration = get_from_dict(benchmark_set,locbuf); + duration = get_from_dict(benchmark_set, locbuf); } - DEBUG2("Simulate the run of a task of %f sec for %s",duration,locbuf); - task = MSG_task_create("task", (duration)/reference, 0 , NULL); - MSG_task_execute(task); - MSG_task_destroy(task); + DEBUG2("Simulate the run of a task of %f sec for %s", duration, locbuf); + gras_cpu_burn(duration/reference); return 0; } -void gras_chrono_init(void) -{ - if(!benchmark_set) { - benchmark_set = xbt_dict_new(); - timer = xbt_os_timer_new(); - } -} - -void gras_chrono_exit(void) { - if (locbuf) free(locbuf); - xbt_dict_free(&benchmark_set); - xbt_os_timer_free(timer); -} /*** Conditional execution support ***/ -int gras_if_RL(void) { - return 0; +int gras_if_RL(void) +{ + return 0; } -int gras_if_SG(void) { - return 1; +int gras_if_SG(void) +{ + return 1; } - -