X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..b0954ccfc711fbfd5113ba54779d02e9b5450028:/src/msg/msg_mailbox.c diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c index f88edeb91e..bedccad273 100644 --- a/src/msg/msg_mailbox.c +++ b/src/msg/msg_mailbox.c @@ -8,95 +8,46 @@ #include "mailbox.h" #include "msg/private.h" - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)"); -static xbt_dict_t msg_mailboxes = NULL; - -void MSG_mailbox_mod_init(void) -{ - msg_mailboxes = xbt_dict_new(); -} - -void MSG_mailbox_mod_exit(void) -{ - xbt_dict_free(&msg_mailboxes); -} - -msg_mailbox_t MSG_mailbox_create(const char *alias) -{ - msg_mailbox_t mailbox = xbt_new0(s_msg_mailbox_t, 1); - - mailbox->cond = NULL; - mailbox->alias = alias ? xbt_strdup(alias) : NULL; - mailbox->rdv = SIMIX_rdv_create(alias); - - return mailbox; -} - msg_mailbox_t MSG_mailbox_new(const char *alias) { - msg_mailbox_t mailbox = MSG_mailbox_create(alias); - - /* add the mbox in the dictionary */ - xbt_dict_set(msg_mailboxes, alias, mailbox, MSG_mailbox_free); - - return mailbox; + return SIMIX_req_rdv_create(alias); } void MSG_mailbox_free(void *mailbox) { - msg_mailbox_t _mailbox = (msg_mailbox_t) mailbox; - - free(_mailbox->alias); - SIMIX_rdv_destroy(_mailbox->rdv); - - free(_mailbox); -} - -smx_cond_t MSG_mailbox_get_cond(msg_mailbox_t mailbox) -{ - return mailbox->cond; + SIMIX_req_rdv_destroy((msg_mailbox_t)mailbox); } int MSG_mailbox_is_empty(msg_mailbox_t mailbox) { - return (NULL == SIMIX_rdv_get_head(mailbox->rdv)); + return (NULL == SIMIX_req_rdv_get_head(mailbox)); } m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox) { - smx_comm_t comm = SIMIX_rdv_get_head(mailbox->rdv); + smx_action_t comm = SIMIX_req_rdv_get_head(mailbox); if (!comm) return NULL; - return (m_task_t) SIMIX_communication_get_data(comm); + return (m_task_t) SIMIX_req_comm_get_src_data(comm); } int MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox, m_host_t host) { - return SIMIX_rdv_get_count_waiting_comm(mailbox->rdv, - host->simdata->smx_host); -} - -void MSG_mailbox_set_cond(msg_mailbox_t mailbox, smx_cond_t cond) -{ - mailbox->cond = cond; -} - -const char *MSG_mailbox_get_alias(msg_mailbox_t mailbox) -{ - return mailbox->alias; + return SIMIX_req_rdv_comm_count_by_host(mailbox, + host->simdata->smx_host); } msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias) { - msg_mailbox_t mailbox = xbt_dict_get_or_null(msg_mailboxes, alias); + msg_mailbox_t mailbox = SIMIX_req_rdv_get_by_name(alias); if (!mailbox) mailbox = MSG_mailbox_new(alias); @@ -107,8 +58,8 @@ msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias) msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host, m_channel_t channel) { - xbt_assert0((host != NULL), "Invalid host"); - xbt_assert1((channel >= 0) + xbt_assert((host != NULL), "Invalid host"); + xbt_assert((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel); @@ -121,10 +72,6 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task, { xbt_ex_t e; MSG_error_t ret = MSG_OK; - smx_comm_t comm; -#ifdef HAVE_TRACING - double start_time = 0; -#endif /* We no longer support getting a task from a specific host */ if (host) THROW_UNIMPLEMENTED; @@ -132,28 +79,21 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task, CHECK_HOST(); #ifdef HAVE_TRACING TRACE_msg_task_get_start(); - start_time = MSG_get_clock(); + double start_time = MSG_get_clock(); #endif - memset(&comm, 0, sizeof(comm)); - - /* Kept for compatibility with older implementation */ - xbt_assert1(!MSG_mailbox_get_cond(mailbox), - "A process is already blocked on this channel %s", - MSG_mailbox_get_alias(mailbox)); - /* Sanity check */ - xbt_assert0(task, "Null pointer for the task storage"); + xbt_assert(task, "Null pointer for the task storage"); if (*task) - CRITICAL0 - ("MSG_task_get() was asked to write in a non empty task struct."); + XBT_CRITICAL + ("MSG_task_receive() was asked to write in a non empty task struct."); /* Try to receive it by calling SIMIX network layer */ TRY { - SIMIX_network_recv(mailbox->rdv, timeout, task, NULL, &comm); - //INFO2("Got task %s from %s",(*task)->name,mailbox->alias); - (*task)->simdata->refcount--; + SIMIX_req_comm_recv(mailbox, task, NULL, NULL, NULL, timeout); + XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox); + (*task)->simdata->isused=0; } CATCH(e) { switch (e.category) { @@ -167,17 +107,18 @@ MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task, ret = MSG_TIMEOUT; break; default: - xbt_die(bprintf("Unhandled SIMIX network exception: %s", e.msg)); + RETHROW; } xbt_ex_free(e); } - if (ret != MSG_HOST_FAILURE && - ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) { #ifdef HAVE_TRACING + if (ret != MSG_HOST_FAILURE && + ret != MSG_TRANSFER_FAILURE && + ret != MSG_TIMEOUT) { TRACE_msg_task_get_end(start_time, *task); -#endif } +#endif MSG_RETURN(ret); } @@ -189,38 +130,44 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, MSG_error_t ret = MSG_OK; simdata_task_t t_simdata = NULL; m_process_t process = MSG_process_self(); -#ifdef HAVE_TRACING - int call_end = 0; -#endif + simdata_process_t p_simdata = SIMIX_process_self_get_data(); CHECK_HOST(); #ifdef HAVE_TRACING - call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST() + int call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST() #endif - /* Prepare the task to send */ t_simdata = task->simdata; t_simdata->sender = process; t_simdata->source = MSG_host_self(); - xbt_assert0(t_simdata->refcount == 1, + xbt_assert(t_simdata->isused == 0, "This task is still being used somewhere else. You cannot send it now. Go fix your code!"); - t_simdata->refcount++; + t_simdata->isused=1; msg_global->sent_msg++; - process->simdata->waiting_task = task; + + p_simdata->waiting_task = task; /* Try to send it by calling SIMIX network layer */ TRY { - /* Kept for semantical compatibility with older implementation */ - if (mailbox->cond) - SIMIX_cond_signal(mailbox->cond); - - SIMIX_network_send(mailbox->rdv, t_simdata->message_size, - t_simdata->rate, timeout, task, sizeof(void *), - &t_simdata->comm, task); +#ifdef HAVE_TRACING + if (TRACE_is_enabled()) { + smx_action_t comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size, + t_simdata->rate, task, sizeof(void *), + NULL, NULL, 0); + SIMIX_req_set_category(comm, task->category); + SIMIX_req_comm_wait(comm, timeout); + } else { +#endif + SIMIX_req_comm_send(mailbox, t_simdata->message_size, + t_simdata->rate, task, sizeof(void*), + NULL, NULL, timeout); +#ifdef HAVE_TRACING + } +#endif } CATCH(e) { @@ -235,15 +182,15 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, ret = MSG_TIMEOUT; break; default: - xbt_die(bprintf("Unhandled SIMIX network exception: %s", e.msg)); + RETHROW; } xbt_ex_free(e); - /* Decrement the refcount only on failure */ - t_simdata->refcount--; + /* If the send failed, it is not used anymore */ + t_simdata->isused = 0; } - process->simdata->waiting_task = NULL; + p_simdata->waiting_task = NULL; #ifdef HAVE_TRACING if (call_end) TRACE_msg_task_put_end();