From cb95d3ea65453ef5442c905545620dcdf65b5487 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 1 Mar 2023 11:04:24 +0100 Subject: [PATCH] Help to identify null values. --- examples/smpi/mc/sendsend.tesh | 4 ++-- src/kernel/actor/SimcallObserver.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/smpi/mc/sendsend.tesh b/examples/smpi/mc/sendsend.tesh index e719e919b5..c770b80f59 100644 --- a/examples/smpi/mc/sendsend.tesh +++ b/examples/smpi/mc/sendsend.tesh @@ -48,8 +48,8 @@ $ ../../../smpi_script/bin/smpirun -quiet -wrapper "${bindir:=.}/../../../bin/si > [0.000000] [mc_global/INFO] ************************** > [0.000000] [ker_engine/INFO] 2 actors are still running, waiting for something. > [0.000000] [ker_engine/INFO] Legend of the following listing: "Actor (@): " -> [0.000000] [ker_engine/INFO] Actor 1 (0@node-0.simgrid.org) simcall CommWait(comm_id:1 src:1 dst:-1 mbox:SMPI-2(id:2) srcbuf:1 dstbuf:2 bufsize:4) -> [0.000000] [ker_engine/INFO] Actor 2 (1@node-1.simgrid.org) simcall CommWait(comm_id:2 src:2 dst:-1 mbox:SMPI-1(id:0) srcbuf:3 dstbuf:2 bufsize:4) +> [0.000000] [ker_engine/INFO] Actor 1 (0@node-0.simgrid.org) simcall CommWait(comm_id:1 src:1 dst:-1 mbox:SMPI-2(id:2) srcbuf:1 dstbuf:- bufsize:4) +> [0.000000] [ker_engine/INFO] Actor 2 (1@node-1.simgrid.org) simcall CommWait(comm_id:2 src:2 dst:-1 mbox:SMPI-1(id:0) srcbuf:2 dstbuf:- bufsize:4) > [0.000000] [mc_global/INFO] Counter-example execution trace: > [0.000000] [mc_global/INFO] 1: iSend(mbox=2) > [0.000000] [mc_global/INFO] 2: iSend(mbox=0) diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp index 1dfc713edc..a9dc9bf58d 100644 --- a/src/kernel/actor/SimcallObserver.hpp +++ b/src/kernel/actor/SimcallObserver.hpp @@ -146,10 +146,10 @@ public: /* Semi private template used by the to_string methods of various observer classes */ template static std::string ptr_to_id(A* ptr) { - static std::unordered_map map; + static std::unordered_map map({{nullptr, "-"}}); auto [elm, inserted] = map.try_emplace(ptr); if (inserted) - elm->second = std::to_string(map.size()); + elm->second = std::to_string(map.size() - 1); return elm->second; } -- 2.20.1