int i;
smpi_host_data_t hdata;
+ /* Connect our log channels: that must be done manually under windows */
+ /* (should be done only once, not for each process) */
+ XBT_LOG_CONNECT(smpi_base, smpi);
+ XBT_LOG_CONNECT(smpi_bench, smpi);
+ XBT_LOG_CONNECT(smpi_kernel, smpi);
+ XBT_LOG_CONNECT(smpi_mpi, smpi);
+ XBT_LOG_CONNECT(smpi_receiver, smpi);
+ XBT_LOG_CONNECT(smpi_sender, smpi);
+ XBT_LOG_CONNECT(smpi_util, smpi);
+
SIMIX_mutex_lock(smpi_global->running_hosts_count_mutex);
smpi_global->running_hosts_count++;
SIMIX_mutex_unlock(smpi_global->running_hosts_count_mutex);
for (i = 0; i < host_count && host != hosts[i]; i ++);
hdata->index = i;
+ hdata->mutex = SIMIX_mutex_init();
+ hdata->cond = SIMIX_cond_init();
SIMIX_host_set_data(host, hdata);
// wait for all nodes to signal initializatin complete
SIMIX_mutex_lock(smpi_global->start_stop_mutex);
smpi_global->ready_process_count++;
- if (smpi_global->ready_process_count < 3 * host_count) {
- SIMIX_cond_wait(smpi_global->start_stop_cond, smpi_global->start_stop_mutex);
- } else {
+ if (smpi_global->ready_process_count >= 3 * host_count) {
SIMIX_cond_broadcast(smpi_global->start_stop_cond);
}
+ while (smpi_global->ready_process_count < 3 * host_count) {
+ SIMIX_cond_wait(smpi_global->start_stop_cond, smpi_global->start_stop_mutex);
+ }
SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
return;
smpi_global->ready_process_count--;
SIMIX_mutex_unlock(smpi_global->start_stop_mutex);
+ SIMIX_mutex_destroy(smpi_host_mutex());
+ SIMIX_cond_destroy(smpi_host_cond());
+
if (0 >= i) {
// wake up senders/receivers
{
SIMIX_mutex_lock(comm->barrier_mutex);
- if(++comm->barrier_count < comm->size) {
- SIMIX_cond_wait(comm->barrier_cond, comm->barrier_mutex);
- } else {
+ ++comm->barrier_count;
+ if (comm->barrier_count > comm->size) { // only happens on second barrier...
comm->barrier_count = 0;
+ } else if (comm->barrier_count == comm->size) {
SIMIX_cond_broadcast(comm->barrier_cond);
}
+ while (comm->barrier_count < comm->size) {
+ SIMIX_cond_wait(comm->barrier_cond, comm->barrier_mutex);
+ }
SIMIX_mutex_unlock(comm->barrier_mutex);
return MPI_SUCCESS;