From d7e0f298b233063f55fac6c46d6186184edbb7c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Wed, 6 Feb 2019 22:31:18 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@710 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/system/pisystemmonitor.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src_main/system/pisystemmonitor.cpp b/src_main/system/pisystemmonitor.cpp index 9ac44135..86f88461 100755 --- a/src_main/system/pisystemmonitor.cpp +++ b/src_main/system/pisystemmonitor.cpp @@ -164,7 +164,11 @@ void PISystemMonitor::run() { if (t->isPIObject()) tbid[t->tid()] = t->name(); pitc->unlock(); -#ifndef FREERTOS +#ifdef FREERTOS + piForeach (PIThread * t, tv) + if (t->isPIObject()) + gatherThread(t->tid()); +#else //piCout << tbid.keys().toType(); stat.ID = pID_; #ifndef WINDOWS @@ -337,8 +341,10 @@ void PISystemMonitor::makeStrings() { void PISystemMonitor::gatherThread(llong id) { PISystemMonitor::ThreadStats ts; ts.id = id; +#ifdef FREERTOS + ts.name = tbid.value(id, ""); +#else ts.name = tbid.value(id, ""); -#ifndef FREERTOS #ifndef WINDOWS PIFile f(PRIVATE->proc_dir + "task/" + PIString::fromNumber(id) + "/stat"); //piCout << f.path();