From 2fba443f56b425a128c5801a3ddf9752bfd49cf3 Mon Sep 17 00:00:00 2001 From: Vasili Karaev Date: Sat, 15 Sep 2018 17:43:55 +0300 Subject: [PATCH] fix(cpu): Replace %percentage-cores% normally (#1282) --- src/modules/cpu.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/modules/cpu.cpp b/src/modules/cpu.cpp index 829adfca..387c6df0 100644 --- a/src/modules/cpu.cpp +++ b/src/modules/cpu.cpp @@ -34,16 +34,6 @@ namespace modules { m_rampload_core = load_ramp(m_conf, name(), TAG_RAMP_LOAD_PER_CORE); } if (m_formatter->has(TAG_LABEL)) { - // Update the label parameter and replace the %percentag-cores% token with the individual core tokens - string key{&TAG_LABEL[1], strlen(TAG_LABEL) - 2}; - auto label = m_conf.get(name(), key, "%percentage%%"); - vector cores; - for (size_t i = 1; i <= m_cputimes.size(); i++) { - cores.emplace_back("%percentage-core" + to_string(i) + "%%"); - } - label = string_util::replace_all(label, "%percentage-cores%", string_util::join(cores, " ")); - const_cast(m_conf).set(name(), key, move(label)); - m_label = load_optional_label(m_conf, name(), TAG_LABEL, "%percentage%%"); } } @@ -77,6 +67,7 @@ namespace modules { if (m_label) { m_label->reset_tokens(); m_label->replace_token("%percentage%", to_string(static_cast(m_total + 0.5))); + m_label->replace_token("%percentage-cores%", string_util::join(percentage_cores, "% ") + "%"); for (size_t i = 0; i < percentage_cores.size(); i++) { m_label->replace_token("%percentage-core" + to_string(i + 1) + "%", percentage_cores[i]);