From 1755679a15d431fa056e086403a475f5d4d345c3 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 14 Jan 2019 21:04:58 +0100 Subject: [PATCH 1/1] make sure that debugging msg don't cause any segfault --- src/simix/ActorImpl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index a89e3c29b2..73c1c7e9e9 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -23,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); -unsigned long simix_process_maxpid = 0; +static unsigned long simix_process_maxpid = 0; /** * @brief Returns the current agent. @@ -472,8 +472,8 @@ void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer) return; } - XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(), - (issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), actor->get_cname(), + XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer == nullptr ? "(null)" : issuer->get_cname(), + (issuer == nullptr || issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), actor->get_cname(), actor->host_->get_cname()); actor->context_->iwannadie = true; -- 2.20.1