X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c319ec54d6fc778ee3cc5e75a747242006723e..edde8f7fbc1b74a81551bf9eb7bac1935b999296:/src/gras/Virtu/sg_emul.c

diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c
index 62be7c2d3f..7892f4ce33 100644
--- a/src/gras/Virtu/sg_emul.c
+++ b/src/gras/Virtu/sg_emul.c
@@ -23,7 +23,7 @@ void gras_cpu_burn(double flops)
   smx_action_t execution;
 
   if (flops > 0){
-    execution = SIMIX_req_host_execute("task", SIMIX_host_self(), flops);
+    execution = SIMIX_req_host_execute("task", SIMIX_host_self(), flops, 1);
     SIMIX_req_host_execution_wait(execution);
   }
 }
@@ -48,8 +48,7 @@ void gras_emul_init(void)
 
 void gras_emul_exit(void)
 {
-  if (locbuf)
-    free(locbuf);
+  free(locbuf);
   xbt_dict_free(&benchmark_set);
   xbt_os_timer_free(timer);
 }
@@ -76,7 +75,7 @@ static double get_from_dict(xbt_dict_t dict, const char *key)
 
 int gras_bench_always_begin(const char *location, int line)
 {
-  xbt_assert0(!benchmarking, "Already benchmarking");
+  xbt_assert(!benchmarking, "Already benchmarking");
   benchmarking = 1;
 
   if (!timer)
@@ -86,7 +85,7 @@ int gras_bench_always_begin(const char *location, int line)
 
 int gras_bench_always_end(void)
 {
-  xbt_assert0(benchmarking, "Not benchmarking yet");
+  xbt_assert(benchmarking, "Not benchmarking yet");
   benchmarking = 0;
   xbt_os_timer_stop(timer);
   duration = xbt_os_timer_elapsed(timer);
@@ -99,7 +98,7 @@ int gras_bench_always_end(void)
 int gras_bench_once_begin(const char *location, int line)
 {
   double *ir = NULL;
-  xbt_assert0(!benchmarking, "Already benchmarking");
+  xbt_assert(!benchmarking, "Already benchmarking");
   benchmarking = 1;
 
   if (!locbuf || locbufsize < strlen(location) + 64) {
@@ -110,7 +109,7 @@ int gras_bench_once_begin(const char *location, int line)
 
   ir = xbt_dict_get_or_null(benchmark_set, locbuf);
   if (!ir) {
-    DEBUG1("%s", locbuf);
+    XBT_DEBUG("%s", locbuf);
     duration = 1;
     xbt_os_timer_start(timer);
     return 1;
@@ -122,7 +121,7 @@ int gras_bench_once_begin(const char *location, int line)
 
 int gras_bench_once_end(void)
 {
-  xbt_assert0(benchmarking, "Not benchmarking yet");
+  xbt_assert(benchmarking, "Not benchmarking yet");
   benchmarking = 0;
   if (duration > 0) {
     xbt_os_timer_stop(timer);
@@ -131,7 +130,7 @@ int gras_bench_once_end(void)
   } else {
     duration = get_from_dict(benchmark_set, locbuf);
   }
-  DEBUG2("Simulate the run of a task of %f sec for %s", duration, locbuf);
+  XBT_DEBUG("Simulate the run of a task of %f sec for %s", duration, locbuf);
   gras_cpu_burn(duration / reference);
   return 0;
 }