X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/903f71895fc1cfd7bbc7609c57b9d09153b7011e..cda303b7f7d0015dc738b9fc967aa91be8c669b0:/src/smpi/smpi_bench.c diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c index d87320eb58..9387099b8c 100644 --- a/src/smpi/smpi_bench.c +++ b/src/smpi/smpi_bench.c @@ -1,8 +1,8 @@ -/* Copyright (c) 2007, 2009-2013. The SimGrid Team. +/* Copyright (c) 2007, 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" #include "xbt/dict.h" @@ -126,19 +126,31 @@ void smpi_bench_destroy(void) xbt_dict_free(&calls); } +XBT_PUBLIC(void) smpi_execute_flops_(double *flops); +void smpi_execute_flops_(double *flops) +{ + smpi_execute_flops(*flops); +} + +XBT_PUBLIC(void) smpi_execute_(double *duration); +void smpi_execute_(double *duration) +{ + smpi_execute(*duration); +} + void smpi_execute_flops(double flops) { smx_action_t action; smx_host_t host; host = SIMIX_host_self(); - XBT_DEBUG("Handle real computation time: %g flops", flops); - action = simcall_host_execute("computation", host, flops, 1); + XBT_DEBUG("Handle real computation time: %f flops", flops); + action = simcall_host_execute("computation", host, flops, 1, 0, 0); #ifdef HAVE_TRACING simcall_set_category (action, TRACE_internal_smpi_get_category()); #endif simcall_host_execution_wait(action); } -static void smpi_execute(double duration) +void smpi_execute(double duration) { if (duration >= smpi_cpu_threshold) { XBT_DEBUG("Sleep for %g to handle real computation time", duration); @@ -189,7 +201,7 @@ unsigned int smpi_sleep(unsigned int secs) double flops = (double) secs*simcall_host_get_speed(SIMIX_host_self()); XBT_DEBUG("Sleep for: %f flops", flops); - action = simcall_host_execute("computation", SIMIX_host_self(), flops, 1); + action = simcall_host_execute("computation", SIMIX_host_self(), flops, 1, 0, 0); #ifdef HAVE_TRACING simcall_set_category (action, TRACE_internal_smpi_get_category()); #endif