#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"
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_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;
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;
}
int gras_if_SG(void) {
return 1;
}
-
-