#include "private.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_util, smpi, "Logging specific to SMPI (utilities)");
+
int smpi_gettimeofday(struct timeval *tv, struct timezone *tz)
{
double now;
- int retval = 0;
+ int retval;
smpi_bench_end();
+ retval = 0;
if (NULL == tv) {
retval = -1;
} else {
unsigned int smpi_sleep(unsigned int seconds)
{
- smx_mutex_t mutex;
- smx_cond_t cond;
smx_host_t host;
smx_action_t action;
smpi_bench_end();
- host = SIMIX_host_self();
+
+ host = SIMIX_host_self();
+
+ SIMIX_mutex_lock(smpi_global->execute_mutex);
+
+ // FIXME: explicit conversion to double?
action = SIMIX_action_sleep(host, seconds);
- mutex = SIMIX_mutex_init();
- cond = SIMIX_cond_init();
- SIMIX_mutex_lock(mutex);
- SIMIX_register_action_to_condition(action, cond);
- SIMIX_cond_wait(cond, mutex);
- SIMIX_unregister_action_to_condition(action, cond);
- SIMIX_mutex_unlock(mutex);
+ 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_destroy(mutex);
- SIMIX_cond_destroy(cond);
- //SIMIX_action_destroy(action);
+ SIMIX_mutex_unlock(smpi_global->execute_mutex);
smpi_bench_begin();
return 0;
void smpi_exit(int status)
{
smpi_bench_end();
- SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
- smpi_global->running_hosts_count--;
- SIMIX_mutex_unlock(smpi_global->running_hosts_count_mutex);
+ smpi_mpi_finalize();
SIMIX_process_kill(SIMIX_process_self());
return;
}