X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d0e92347e2ff135459af73e2dc199a3d33f684f..18c57b27dd71ee7839c6a90368c845886a87d638:/src/gras/Virtu/sg_emul.c

diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c
index 4729c35d60..1fce177fe0 100644
--- a/src/gras/Virtu/sg_emul.c
+++ b/src/gras/Virtu/sg_emul.c
@@ -23,8 +23,8 @@ void gras_cpu_burn(double flops)
   smx_action_t execution;
 
   if (flops > 0){
-    execution = SIMIX_req_host_execute("task", SIMIX_host_self(), flops, 1);
-    SIMIX_req_host_execution_wait(execution);
+    execution = simcall_host_execute("task", SIMIX_host_self(), flops, 1);
+    simcall_host_execution_wait(execution);
   }
 }
 
@@ -41,15 +41,14 @@ static unsigned int locbufsize;
 void gras_emul_init(void)
 {
   if (!benchmark_set) {
-    benchmark_set = xbt_dict_new();
+    benchmark_set = xbt_dict_new_homogeneous(xbt_free_f);
     timer = xbt_os_timer_new();
   }
 }
 
 void gras_emul_exit(void)
 {
-  if (locbuf)
-    free(locbuf);
+  free(locbuf);
   xbt_dict_free(&benchmark_set);
   xbt_os_timer_free(timer);
 }
@@ -62,7 +61,7 @@ static void store_in_dict(xbt_dict_t dict, const char *key, double value)
   ir = xbt_dict_get_or_null(dict, key);
   if (!ir) {
     ir = xbt_new0(double, 1);
-    xbt_dict_set(dict, key, ir, xbt_free_f);
+    xbt_dict_set(dict, key, ir, NULL);
   }
   *ir = value;
 }
@@ -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;
 }