This, modify the declaration of type of function pointer. It also clear the warnings...

[simgrid.git] / src / gras / Virtu / sg_emul.c

diff --git a/src/gras/Virtu/sg_emul.c b/src/gras/Virtu/sg_emul.c
index 57dd237..1f4305e 100644 (file)
--- a/src/gras/Virtu/sg_emul.c
+++ b/src/gras/Virtu/sg_emul.c
@@ -12,7 +12,7 @@
 #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"
 
@@ -26,7 +26,7 @@ static double reference = .00000000523066250047108838; /* FIXME: we should bench
 static double duration = 0.0;
 
 static char* locbuf = NULL;
-static int locbufsize;
+static unsigned int locbufsize;
 
 void gras_emul_init(void)
 {
@@ -73,15 +73,31 @@ 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_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);
+
   return 0;
 }
 
@@ -110,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;
@@ -122,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_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);
   return 0;
 }
 
@@ -138,5 +168,3 @@ int gras_if_RL(void) {
 int gras_if_SG(void) {
    return 1;
 }
-
-