Integrate Bruno's work on SIMIX onto main stream. Tests are broken, but it looks...

[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..e37d750 100644 (file)
--- a/src/gras/Virtu/sg_emul.c
+++ b/src/gras/Virtu/sg_emul.c
@@ -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_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;
 }
 
@@ -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_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;
 }
 
@@ -139,4 +169,59 @@ int gras_if_SG(void) {
    return 1;
 }
 
+void gras_global_init(int *argc,char **argv) {
+return SIMIX_global_init(argc,argv);
+}
+void gras_create_environment(const char *file) {
+return SIMIX_create_environment(file);
+}
+void gras_function_register(const char *name, void *code) {
+return SIMIX_function_register(name, (smx_process_code_t)code);
+}
+void gras_main() {
+       smx_cond_t cond = NULL;
+       smx_action_t smx_action;
+       xbt_fifo_t actions_done = xbt_fifo_new();
+       xbt_fifo_t actions_failed = xbt_fifo_new();
+
+
+       /* Clean IO before the run */
+       fflush(stdout);
+       fflush(stderr);
+
+
+       while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
+
+               while ( (smx_action = xbt_fifo_pop(actions_failed)) ) {
+
+
+                       DEBUG1("** %s failed **",smx_action->name);
+                       while ( (cond = xbt_fifo_pop(smx_action->cond_list)) ) {
+                               SIMIX_cond_broadcast(cond);
+                       }
+                       /* action finished, destroy it */
+               //      SIMIX_action_destroy(smx_action);
+               }
+
+               while ( (smx_action = xbt_fifo_pop(actions_done)) ) {
+
+                       DEBUG1("** %s done **",smx_action->name);
+                       while ( (cond = xbt_fifo_pop(smx_action->cond_list)) ) {
+                               SIMIX_cond_broadcast(cond);
+                       }
+                       /* action finished, destroy it */
+                       //SIMIX_action_destroy(smx_action);
+               }
+       }
+       xbt_fifo_free(actions_failed);
+       xbt_fifo_free(actions_done);
+  return;
+
+}
+void gras_launch_application(const char *file) {
+return SIMIX_launch_application(file);
+}
+void gras_clean() {
+return SIMIX_clean();
+}