Improve debug messages

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 68d36ae..6b4922f 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -625,7 +625,9 @@ void SIMIX_comm_finish(smx_action_t action)
       case SIMIX_LINK_FAILURE:
         TRY {
          XBT_DEBUG("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p)",
       case SIMIX_LINK_FAILURE:
         TRY {
          XBT_DEBUG("Link failure in action %p between '%s' and '%s': posting an exception to the issuer: %s (%p)",

-             action, action->comm.src_proc->smx_host->name, action->comm.dst_proc->smx_host->name,
+             action,
+             action->comm.src_proc ? action->comm.src_proc->smx_host->name : NULL,
+             action->comm.dst_proc ? action->comm.dst_proc->smx_host->name : NULL,

              req->issuer->name, req->issuer);
           THROWF(network_error, 0, "Link failure");
         }
              req->issuer->name, req->issuer);
           THROWF(network_error, 0, "Link failure");
         }

diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index 6a65331..bd82cea 100644 (file)
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -29,7 +29,8 @@ void SIMIX_request_push()
 void SIMIX_request_answer(smx_req_t req)
 {
   if (req->issuer != simix_global->maestro_process){
 void SIMIX_request_answer(smx_req_t req)
 {
   if (req->issuer != simix_global->maestro_process){

-    XBT_DEBUG("Answer request %s (%d)", SIMIX_request_name(req->call), req->call);
+    XBT_DEBUG("Answer request %s (%d) issued by %s (%p)", SIMIX_request_name(req->call), req->call,
+        req->issuer->name, req->issuer);

     req->issuer->request.call = REQ_NO_REQ;
     xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer);
   }
     req->issuer->request.call = REQ_NO_REQ;
     xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, req->issuer);
   }