#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
#include "simix/simix.h" /* semaphores for the barrier */
#include "xbt.h" /* calloc, printf */
-#include "simgrid_config.h" /* getline */
#include "instr/instr_private.h"
-void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
-
XBT_LOG_NEW_DEFAULT_CATEGORY(actions,
"Messages specific for this msg example");
int communicator_size = 0;
value = strtod(string, &endptr);
if (*endptr != '\0')
- THROW1(unknown_error, 0, "%s is not a double", string);
+ THROWF(unknown_error, 0, "%s is not a double", string);
return value;
}
XBT_VERB("%s %f", name, MSG_get_clock() - clock);
- if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- free(name);
+ free(name);
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, rank, dst_traced, "send");
#endif
XBT_DEBUG("Receiving: %s", name);
- MSG_task_receive(&task, mailbox_name);
+ MSG_error_t res = MSG_task_receive(&task, mailbox_name);
// MSG_task_receive(&task, MSG_process_get_name(MSG_process_self()));
XBT_VERB("%s %f", name, MSG_get_clock() - clock);
- MSG_task_destroy(task);
- if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- free(name);
+ if (res == MSG_OK) {
+ MSG_task_destroy(task);
+ }
+
+ free(name);
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, src_traced, rank, "recv");
TRACE_smpi_recv(rank, src_traced, rank);
double clock = MSG_get_clock();
process_globals_t globals = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert1(xbt_dynar_length(globals->irecvs),
+ xbt_assert(xbt_dynar_length(globals->irecvs),
"action wait not preceded by any irecv: %s", xbt_str_join_array(action," "));
if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
MSG_task_destroy(task);
XBT_VERB("%s %f", name, MSG_get_clock() - clock);
- if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- free(name);
+ free(name);
#ifdef HAVE_TRACING
TRACE_smpi_ptp_out(rank, src_traced, rank, "wait");
TRACE_smpi_recv(rank, src_traced, rank);
name = xbt_str_join_array(action, " ");
if (mutex == NULL) { // first arriving on the barrier
- mutex = SIMIX_req_mutex_init();
- cond = SIMIX_req_cond_init();
+ mutex = simcall_mutex_init();
+ cond = simcall_cond_init();
processes_arrived_sofar=0;
}
XBT_DEBUG("Entering barrier: %s (%d already there)", name,processes_arrived_sofar);
- SIMIX_req_mutex_lock(mutex);
+ simcall_mutex_lock(mutex);
if (++processes_arrived_sofar == communicator_size) {
- SIMIX_req_cond_broadcast(cond);
- SIMIX_req_mutex_unlock(mutex);
+ simcall_cond_broadcast(cond);
+ simcall_mutex_unlock(mutex);
} else {
- SIMIX_req_cond_wait(cond,mutex);
- SIMIX_req_mutex_unlock(mutex);
+ simcall_cond_wait(cond,mutex);
+ simcall_mutex_unlock(mutex);
}
XBT_DEBUG("Exiting barrier: %s", name);
processes_arrived_sofar--;
if (!processes_arrived_sofar) {
- SIMIX_req_cond_destroy(cond);
- SIMIX_req_mutex_destroy(mutex);
+ simcall_cond_destroy(cond);
+ simcall_mutex_destroy(mutex);
mutex=NULL;
}
- if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- free(name);
+ free(name);
}
process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+ xbt_assert(communicator_size, "Size of Communicator is not defined, "
"can't use collective operations");
process_name = MSG_process_get_name(MSG_process_self());
process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+ xbt_assert(communicator_size, "Size of Communicator is not defined, "
"can't use collective operations");
process_name = MSG_process_get_name(MSG_process_self());
MSG_process_sleep(parse_double(duration));
XBT_VERB("%s %f ", name, MSG_get_clock() - clock);
- if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- free(name);
+ free(name);
}
static void action_allReduce(const char *const *action) {
process_globals_t counters = (process_globals_t) MSG_process_get_data(MSG_process_self());
- xbt_assert0(communicator_size, "Size of Communicator is not defined, "
+ xbt_assert(communicator_size, "Size of Communicator is not defined, "
"can't use collective operations");
process_name = MSG_process_get_name(MSG_process_self());
name = xbt_str_join_array(action, " ");
communicator_size = parse_double(size);
XBT_VERB("%s %f", name, MSG_get_clock() - clock);
- if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- free(name);
+ free(name);
}
static void action_compute(const char *const *action)
MSG_task_execute(task);
MSG_task_destroy(task);
XBT_VERB("%s %f", name, MSG_get_clock() - clock);
- if (XBT_LOG_ISENABLED(actions, xbt_log_priority_verbose))
- free(name);
+ free(name);
}
static void action_init(const char *const *action)
{
MSG_error_t res = MSG_OK;
- smx_factory_initializer_to_use = SIMIX_ctx_raw_factory_init;
-
/* Check the given arguments */
MSG_global_init(&argc, argv);
if (argc < 3) {