- SIMIX_mutex_lock(smpi_global->execute_mutex);
-
- action = SIMIX_action_execute(host, "computation", duration * SMPI_DEFAULT_SPEED);
-
- SIMIX_register_action_to_condition(action, smpi_global->execute_cond);
- SIMIX_cond_wait(smpi_global->execute_cond, smpi_global->execute_mutex);
- SIMIX_unregister_action_to_condition(action, smpi_global->execute_cond);
- SIMIX_action_destroy(action);
-
- SIMIX_mutex_unlock(smpi_global->execute_mutex);
-
- return;
+void smpi_execute(double duration)
+{
+ smx_host_t host;
+ smx_action_t action;
+ smx_mutex_t mutex;
+ smx_cond_t cond;
+ e_surf_action_state_t state;
+
+ if(duration > 0.001) {
+ host = SIMIX_host_self();
+ mutex = SIMIX_mutex_init();
+ cond = SIMIX_cond_init();
+ DEBUG1("Sleep for %f to handle real computation time", duration);
+ duration *= xbt_cfg_get_double(_surf_cfg_set, "reference_speed");
+ action = SIMIX_action_execute(host, "computation", duration);
+ SIMIX_mutex_lock(mutex);
+ SIMIX_register_action_to_condition(action, cond);
+ for (state = SIMIX_action_get_state(action);
+ state == SURF_ACTION_READY ||
+ state == SURF_ACTION_RUNNING; state = SIMIX_action_get_state(action)) {
+ SIMIX_cond_wait(cond, mutex);
+ }
+ SIMIX_unregister_action_to_condition(action, cond);
+ SIMIX_mutex_unlock(mutex);
+ SIMIX_action_destroy(action);
+ SIMIX_cond_destroy(cond);
+ SIMIX_mutex_destroy(mutex);
+ }