From 4e35bb89766d06a9d8c0778b5adca53eba52396d Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 18 Oct 2017 18:31:16 +0200 Subject: [PATCH] should (hopefully) fix build --- src/msg/instr_msg_process.cpp | 2 +- src/msg/msg_private.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp index 6547e1df2a..92c01a1617 100644 --- a/src/msg/instr_msg_process.cpp +++ b/src/msg/instr_msg_process.cpp @@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process"); std::string instr_process_id(msg_process_t proc) { - return proc->getName() + "-" + std::to_string(proc->getPid()); + return std::string(proc->getCname()) + "-" + std::to_string(proc->getPid()); } void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host) diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 7a85a48688..d689f4ccdc 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -94,6 +94,8 @@ struct s_MSG_Global_t { }; typedef s_MSG_Global_t* MSG_Global_t; +XBT_PRIVATE std::string instr_process_id(msg_process_t proc); + extern "C" { XBT_PUBLIC_DATA(MSG_Global_t) msg_global; @@ -121,7 +123,6 @@ XBT_PRIVATE int TRACE_msg_task_put_start(msg_task_t task); // returns TRUE if th XBT_PRIVATE void TRACE_msg_task_put_end(); /* declaration of instrumentation functions from msg_process_instr.c */ -XBT_PRIVATE std::string instr_process_id(msg_process_t proc); XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host); XBT_PRIVATE void TRACE_msg_process_create(const char* process_name, int process_pid, msg_host_t host); XBT_PRIVATE void TRACE_msg_process_destroy(const char* process_name, int process_pid); -- 2.20.1