X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9189fe94c14ef9e31142d1603a1979ea7e731a0a..78f7b6b11f281beb6250137ee404a94ec4cf7f77:/src/gras/Virtu/sg_emul.c

diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c
index 127cfbe064..511ba97082 100644
--- a/src/gras/Virtu/sg_emul.c
+++ b/src/gras/Virtu/sg_emul.c
@@ -7,21 +7,22 @@
 /* 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 <stdio.h> /* 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(emul,gras,"Emulation support");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_virtu_emul,gras_virtu,"Emulation support");
 
 /*** 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;
@@ -45,21 +46,11 @@ void gras_emul_exit(void) {
 static void store_in_dict(xbt_dict_t dict, const char *key, double value)
 {
   double *ir;
-  xbt_ex_t e;
-
-  TRY {
-    ir = xbt_dict_get(dict, key);
-  } CATCH(e) {
-    if (e.category == mismatch_error) {
-      ir = NULL;
-      xbt_ex_free(e);
-    } else {
-      RETHROW;
-    }
-  }
+
+  ir = xbt_dict_get_or_null(dict, key);
   if (!ir) {
     ir = xbt_new0(double,1);
-    xbt_dict_set(dict, key, ir, free);
+    xbt_dict_set(dict, key, ir, xbt_free_f);
   }
   *ir = value;
 }
@@ -82,21 +73,36 @@ int gras_bench_always_begin(const char *location,int line)
 
 int gras_bench_always_end(void)
 {
-  m_task_t task = NULL;
-  
+	smx_action_t act;
+	smx_cond_t cond;
+	smx_mutex_t mutex;
+
   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);
+
+	cond = SIMIX_cond_init();
+	mutex = SIMIX_mutex_init();
+	
+	SIMIX_mutex_lock(mutex);
+	act = SIMIX_action_execute(SIMIX_host_self(), (char*) "task", (duration)/reference);
+	
+	SIMIX_register_action_to_condition(act,cond);
+	SIMIX_register_condition_to_action(act,cond);
+	SIMIX_cond_wait(cond, mutex);
+	
+	SIMIX_action_destroy(act);
+	SIMIX_mutex_unlock(mutex);
+
+	SIMIX_cond_destroy(cond);
+	SIMIX_mutex_destroy(mutex);
+
   return 0;
 }
 
 int gras_bench_once_begin(const char *location,int line) { 
   double *ir = NULL;
-  xbt_ex_t e;
   xbt_assert0(!benchmarking,"Already benchmarking");
   benchmarking = 1;
 
@@ -106,16 +112,7 @@ int gras_bench_once_begin(const char *location,int line) {
   }
   sprintf(locbuf,"%s:%d",location, line);
    
-  TRY {
-    ir = xbt_dict_get(benchmark_set, locbuf);
-  } CATCH(e) {
-    if (e.category == mismatch_error) {
-      xbt_ex_free(e);
-      ir = NULL;
-    } else {
-      RETHROW;
-    }
-  }
+  ir = xbt_dict_get_or_null(benchmark_set, locbuf);
   if(!ir) {
     DEBUG1("%s",locbuf); 
     duration = 1;
@@ -129,7 +126,9 @@ int gras_bench_once_begin(const char *location,int line) {
 
 int gras_bench_once_end(void)
 {
-  m_task_t task = NULL;
+	smx_action_t act;
+	smx_cond_t cond;
+	smx_mutex_t mutex;
 
   xbt_assert0(benchmarking,"Not benchmarking yet");
   benchmarking = 0;
@@ -141,9 +140,21 @@ int gras_bench_once_end(void)
     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);
+	cond = SIMIX_cond_init();
+	mutex = SIMIX_mutex_init();
+	
+	SIMIX_mutex_lock(mutex);
+	act = SIMIX_action_execute(SIMIX_host_self(), (char*)"task", (duration)/reference);
+	
+	SIMIX_register_action_to_condition(act,cond);
+	SIMIX_register_condition_to_action(act,cond);
+	SIMIX_cond_wait(cond, mutex);
+	
+	SIMIX_action_destroy(act);
+	SIMIX_mutex_unlock(mutex);
+
+	SIMIX_cond_destroy(cond);
+	SIMIX_mutex_destroy(mutex);
   return 0;
 }
 
@@ -157,5 +168,3 @@ int gras_if_RL(void) {
 int gras_if_SG(void) {
    return 1;
 }
-
-