communicator::communicator()
: host(static_cast<hostdata*>(MSG_host_get_data(MSG_host_self())))
- , mutex(xbt_mutex_init())
- , cond(xbt_cond_init())
, ctrl_task(NULL)
, ctrl_comm(NULL)
, data_task(NULL)
, data_comm(NULL)
+ , receiver_mutex(xbt_mutex_init())
+ , receiver_cond(xbt_cond_init())
{
- xbt_mutex_acquire(mutex);
- receiver_process =
+ xbt_mutex_acquire(receiver_mutex);
+ receiver_thread =
MSG_process_create("receiver", communicator::receiver_wrapper,
this, MSG_host_self());
- xbt_cond_wait(cond, mutex); // wait for the receiver to be ready
- xbt_mutex_release(mutex);
+ // wait for the receiver to be ready
+ xbt_cond_wait(receiver_cond, receiver_mutex);
+ xbt_mutex_release(receiver_mutex);
}
communicator::~communicator()
task = MSG_task_create("finalize", 0.0, 0, NULL);
MSG_task_send(task, get_data_mbox());
- xbt_mutex_acquire(mutex);
- while (receiver_process) {
+ xbt_mutex_acquire(receiver_mutex);
+ while (receiver_thread) {
XBT_DEBUG("waiting for receiver to terminate");
- xbt_cond_wait(cond, mutex);
+ xbt_cond_wait(receiver_cond, receiver_mutex);
}
- xbt_mutex_release(mutex);
+ xbt_mutex_release(receiver_mutex);
if (ctrl_comm)
XBT_WARN("ctrl_comm is pending!");
if (data_comm)
XBT_WARN("data_comm is pending!");
if (!received.empty())
- XBT_WARN("lost %lu received message%s!",
- (unsigned long )received.size(), ESSE(received.size()));
+ XBT_WARN("lost %zu received message%s!",
+ received.size(), ESSE(received.size()));
if (!sent_comm.empty())
- XBT_WARN("lost %lu sent message%s!",
- (unsigned long )sent_comm.size(), ESSE(sent_comm.size()));
+ XBT_WARN("lost %zu sent message%s!",
+ sent_comm.size(), ESSE(sent_comm.size()));
- xbt_cond_destroy(cond);
- xbt_mutex_destroy(mutex);
+ xbt_cond_destroy(receiver_cond);
+ xbt_mutex_destroy(receiver_mutex);
}
void communicator::send(const char* dest, message* msg)
if (timeout != 0) {
volatile double deadline =
timeout > 0 ? MSG_get_clock() + timeout : 0.0;
- xbt_mutex_acquire(mutex);
+ xbt_mutex_acquire(receiver_mutex);
while (received.empty() && (!deadline || deadline > MSG_get_clock())) {
xbt_ex_t e;
XBT_DEBUG("waiting for a message to come");
TRY {
if (deadline)
- xbt_cond_timedwait(cond, mutex, deadline - MSG_get_clock());
+ xbt_cond_timedwait(receiver_cond, receiver_mutex,
+ deadline - MSG_get_clock());
else
- xbt_cond_wait(cond, mutex);
+ xbt_cond_wait(receiver_cond, receiver_mutex);
}
CATCH (e) {
if (e.category != timeout_error)
xbt_ex_free(e);
}
}
- xbt_mutex_release(mutex);
+ xbt_mutex_release(receiver_mutex);
}
if (received.empty())
{
communicator* comm;
comm = static_cast<communicator*>(MSG_process_get_data(MSG_process_self()));
- int result = comm->receiver();
+ comm->receiver();
XBT_DEBUG("terminate");
- xbt_mutex_acquire(comm->mutex);
- comm->receiver_process = NULL;
- xbt_cond_signal(comm->cond);
- xbt_mutex_release(comm->mutex);
+ xbt_mutex_acquire(comm->receiver_mutex);
+ comm->receiver_thread = NULL;
+ xbt_cond_signal(comm->receiver_cond);
+ xbt_mutex_release(comm->receiver_mutex);
- return result;
+ return 0;
+}
+
+void communicator::receiver1(msg_comm_t& comm, m_task_t& task, const char* mbox)
+{
+ MSG_comm_destroy(comm);
+ if (strcmp(MSG_task_get_name(task), "finalize")) {
+ XBT_DEBUG("received message on %s", mbox);
+ xbt_mutex_acquire(receiver_mutex);
+ received.push(task);
+ xbt_cond_signal(receiver_cond);
+ xbt_mutex_release(receiver_mutex);
+ task = NULL;
+ comm = MSG_task_irecv(&task, mbox);
+ } else {
+ XBT_DEBUG("received finalize on %s", mbox);
+ MSG_task_destroy(task);
+ task = NULL;
+ comm = NULL;
+ }
}
-int communicator::receiver()
+void communicator::receiver()
{
ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
data_comm = MSG_task_irecv(&data_task, get_data_mbox());
XBT_DEBUG("receiver ready");
- xbt_mutex_acquire(mutex);
- xbt_cond_signal(cond); // signal master that we are ready
- xbt_mutex_release(mutex);
+ xbt_mutex_acquire(receiver_mutex);
+ xbt_cond_signal(receiver_cond); // signal master that we are ready
+ xbt_mutex_release(receiver_mutex);
xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
while (ctrl_comm || data_comm) {
xbt_dynar_push(comms, &ctrl_comm);
if (data_comm)
xbt_dynar_push(comms, &data_comm);
- MSG_comm_waitany(comms);
+ int index = MSG_comm_waitany(comms);
+ msg_comm_t finished_comm = xbt_dynar_get_as(comms, index, msg_comm_t);
xbt_dynar_reset(comms);
- if (ctrl_comm && comm_test_n_destroy(ctrl_comm)) {
- if (strcmp(MSG_task_get_name(ctrl_task), "finalize")) {
- XBT_DEBUG("received message from ctrl");
- xbt_mutex_acquire(mutex);
- received.push(ctrl_task);
- xbt_mutex_release(mutex);
- ctrl_task = NULL;
- ctrl_comm = MSG_task_irecv(&ctrl_task, get_ctrl_mbox());
- } else {
- XBT_DEBUG("received finalize from ctrl");
- MSG_task_destroy(ctrl_task);
- ctrl_task = NULL;
- ctrl_comm = NULL;
- }
- }
-
- if (data_comm && comm_test_n_destroy(data_comm)) {
- if (strcmp(MSG_task_get_name(data_task), "finalize")) {
- XBT_DEBUG("received message from data");
- xbt_mutex_acquire(mutex);
- received.push(data_task);
- xbt_mutex_release(mutex);
- data_task = NULL;
- data_comm = MSG_task_irecv(&data_task, get_data_mbox());
- } else {
- XBT_DEBUG("received finalize from data");
- MSG_task_destroy(data_task);
- data_task = NULL;
- data_comm = NULL;
- }
- }
- xbt_mutex_acquire(mutex);
- if (!received.empty())
- xbt_cond_signal(cond);
- xbt_mutex_release(mutex);
+ if (finished_comm == ctrl_comm)
+ receiver1(ctrl_comm, ctrl_task, get_ctrl_mbox());
+ else if (finished_comm == data_comm)
+ receiver1(data_comm, data_task, get_data_mbox());
+ else
+ THROW1(0, 0, "Cannot handle unknown comm -- %p", finished_comm);
}
xbt_dynar_free(&comms);
- return 0;
}
// Local variables:
