align namespaces on directories for kernel::activity

[simgrid.git] / src / msg / msg_mailbox.cpp

diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp
index 1594821..d463698 100644 (file)
--- a/src/msg/msg_mailbox.cpp
+++ b/src/msg/msg_mailbox.cpp
@@ -6,27 +6,24 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <xbt/ex.hpp>
+
 #include "simgrid/msg.h"
 #include "msg_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");
 
-msg_mailbox_t MSG_mailbox_new(const char *alias)
-{
-  return simcall_mbox_create(alias);
-}
-
 int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
 {
-  return (NULL == simcall_mbox_front(mailbox));
+  return (nullptr == simcall_mbox_front(mailbox));
 }
 
 msg_task_t MSG_mailbox_front(msg_mailbox_t mailbox)
 {
-  simgrid::simix::Comm* comm = static_cast<simgrid::simix::Comm*>(simcall_mbox_front(mailbox));
+  simgrid::kernel::activity::Comm* comm = static_cast<simgrid::kernel::activity::Comm*>(simcall_mbox_front(mailbox));
 
   if (!comm)
-    return NULL;
+    return nullptr;
 
   return (msg_task_t) comm->src_data;
 }
@@ -36,7 +33,7 @@ msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
   msg_mailbox_t mailbox = simcall_mbox_get_by_name(alias);
 
   if (!mailbox)
-    mailbox = MSG_mailbox_new(alias);
+    mailbox = simcall_mbox_create(alias);
 
   return mailbox;
 }
@@ -54,7 +51,7 @@ void MSG_mailbox_set_async(const char *alias){
   msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias);
 
   simcall_mbox_set_receiver(mailbox, SIMIX_process_self());
-  XBT_VERB("%s mailbox set to receive eagerly for process %p\n",alias, SIMIX_process_self());
+  XBT_VERB("%s mailbox set to receive eagerly for myself\n",alias);
 }
 
 /** \ingroup msg_mailbox_management
@@ -90,7 +87,6 @@ msg_error_t MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t *task, ms
 msg_error_t MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t * task, msg_host_t host, double timeout,
                                              double rate)
 {
-  xbt_ex_t e;
   msg_error_t ret = MSG_OK;
   /* We no longer support getting a task from a specific host */
   if (host)
@@ -106,14 +102,12 @@ msg_error_t MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *
     XBT_WARN("Asked to write the received task in a non empty struct -- proceeding.");
 
   /* Try to receive it by calling SIMIX network layer */
-  TRY {
-    simcall_comm_recv(MSG_process_self(), mailbox, task, NULL, NULL, NULL, NULL, timeout, rate);
+  try {
+    simcall_comm_recv(MSG_process_self(), mailbox, task, nullptr, nullptr, nullptr, nullptr, timeout, rate);
     XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
-    if (msg_global->debug_multiple_use && (*task)->simdata->isused!=0)
-      xbt_ex_free(*(xbt_ex_t*)(*task)->simdata->isused);
-    (*task)->simdata->isused = 0;
+    (*task)->simdata->setNotUsed();
   }
-  CATCH(e) {
+  catch (xbt_ex& e) {
     switch (e.category) {
     case cancel_error:
       ret = MSG_HOST_FAILURE;
@@ -128,9 +122,8 @@ msg_error_t MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *
       ret = MSG_HOST_FAILURE;
       break;
     default:
-      RETHROW;
+      throw;
     }
-    xbt_ex_free(e);
   }
 
   if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {