[mc] Get rid of the ugly "value" out parameter in MC_state_get_request()

[simgrid.git] / src / mc / mc_request.cpp

diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index 121ce91..cc84403 100644 (file)
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -10,6 +10,7 @@
 #include <xbt/str.h>
 #include <xbt/sysdep.h>
 #include <xbt/dynar.h>
+#include <xbt/swag.h>
 
 #include "src/mc/mc_request.h"
 #include "src/mc/mc_safety.h"
@@ -106,7 +107,7 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
 
   if (r1->call == SIMCALL_COMM_WAIT
       && (r2->call == SIMCALL_COMM_WAIT || r2->call == SIMCALL_COMM_TEST)
-      && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == NULL))
+      && (synchro1->comm.src_proc == nullptr || synchro1->comm.dst_proc == nullptr))
     return false;
 
   if (r1->call == SIMCALL_COMM_TEST &&
@@ -133,7 +134,7 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
   return true;
 }
 
-// Those are MC_state_get_internal_request(state)
+// Those are internal_req
 bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
 {
   if (r1->issuer == r2->issuer)
@@ -313,7 +314,7 @@ std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid
         act = remote_act;
 
     char* p;
-    if (act->comm.src_proc == nullptr || act->comm.dst_proc == NULL) {
+    if (act->comm.src_proc == nullptr || act->comm.dst_proc == nullptr) {
       type = "Test FALSE";
       p = pointer_to_string(remote_act);
       args = bprintf("comm=%s", p);
@@ -539,7 +540,7 @@ std::string request_get_dot_output(smx_simcall_t req, int value)
     s_smx_synchro_t synchro;
     mc_model_checker->process().read_bytes(&synchro,
       sizeof(synchro), remote(remote_act));
-    if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == NULL) {
+    if (synchro.comm.src_proc == nullptr || synchro.comm.dst_proc == nullptr) {
       if (issuer->host)
         label = simgrid::xbt::string_printf("[(%lu)%s] Test FALSE",
                     issuer->pid,