From 79853b8925152a5b89d3f8f44d64ffaf284a0196 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 29 May 2017 18:00:15 +0200 Subject: [PATCH 1/1] tiny doc update and cosmetics --- include/simgrid/s4u/Host.hpp | 8 ++++---- src/surf/ptask_L07.cpp | 2 +- src/surf/xml/surfxml_sax_cb.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp index 665f2c85fe..ab1dd5e1a9 100644 --- a/include/simgrid/s4u/Host.hpp +++ b/include/simgrid/s4u/Host.hpp @@ -119,13 +119,13 @@ public: /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */ kernel::routing::NetPoint* pimpl_netpoint = nullptr; - /*** Called on each newly created object */ + /*** Called on each newly created host */ static simgrid::xbt::signal onCreation; - /*** Called just before destructing an object */ + /*** Called just before destructing an host */ static simgrid::xbt::signal onDestruction; - /*** Called when the machine is turned on or off */ + /*** Called when the machine is turned on or off (called AFTER the change) */ static simgrid::xbt::signal onStateChange; - /*** Called when the speed of the machine is changed + /*** Called when the speed of the machine is changed (called AFTER the change) * (either because of a pstate switch or because of an external load event coming from the profile) */ static simgrid::xbt::signal onSpeedChange; }; diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 042c185efd..c960134bbf 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -316,7 +316,7 @@ void CpuL07::onSpeedChange() { Action* action = static_cast(lmm_variable_id(var)); lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); - } + } Cpu::onSpeedChange(); } diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 12611da1da..ac88aa5092 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -1102,7 +1102,7 @@ void surf_parse_open(const char *file) xbt_free(dir); surf_file_to_parse = surf_fopen(file, "r"); - xbt_assert((surf_file_to_parse), "Unable to open \"%s\"\n", file); + xbt_assert(surf_file_to_parse != nullptr, "Unable to open '%s'\n", file); surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE); surf_parse__switch_to_buffer(surf_input_buffer); surf_parse_lineno = 1; -- 2.20.1