SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@711 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2019-02-06 22:37:32 +00:00
parent d7e0f298b2
commit 4ceada9d0c
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src_main/system/pisystemmonitor.cpp
View File

@@ -56,7 +56,6 @@ PRIVATE_DEFINITION_END(PISystemMonitor)
PISystemMonitor::PISystemMonitor(): PIThread() { PISystemMonitor::PISystemMonitor(): PIThread() {
self_ = false;
pID_ = cycle = 0; pID_ = cycle = 0;
cpu_count = PISystemInfo::instance()->processorsCount; cpu_count = PISystemInfo::instance()->processorsCount;
#ifndef FREERTOS #ifndef FREERTOS
@@ -90,7 +89,6 @@ PISystemMonitor::ProcessStats::ProcessStats() {
#ifndef FREERTOS #ifndef FREERTOS
bool PISystemMonitor::startOnProcess(int pID, int interval_ms) { bool PISystemMonitor::startOnProcess(int pID, int interval_ms) {
stop(); stop();
self_ = false;
pID_ = pID; pID_ = pID;
cycle = -1; cycle = -1;
#ifndef WINDOWS #ifndef WINDOWS
@@ -118,12 +116,10 @@ bool PISystemMonitor::startOnProcess(int pID, int interval_ms) {
bool PISystemMonitor::startOnSelf(int interval_ms) { bool PISystemMonitor::startOnSelf(int interval_ms) {
#ifndef FREERTOS #ifndef FREERTOS
bool ret = startOnProcess(PIProcess::currentPID(), interval_ms); bool ret = startOnProcess(PIProcess::currentPID(), interval_ms);
#else
self_ = false;
cycle = -1; cycle = -1;
#else
bool ret = start(interval_ms); bool ret = start(interval_ms);
#endif #endif
self_ = true;
return ret; return ret;
} }

1
src_main/system/pisystemmonitor.h
View File

@@ -90,7 +90,6 @@ private:
PIVector<ThreadStats> cur_ts; PIVector<ThreadStats> cur_ts;
PIMap<llong, ThreadStats> last_tm, cur_tm; PIMap<llong, ThreadStats> last_tm, cur_tm;
PIMap<llong, PIString> tbid; PIMap<llong, PIString> tbid;
bool self_;
int pID_, page_size, cpu_count, cycle; int pID_, page_size, cpu_count, cycle;
#ifndef FREERTOS #ifndef FREERTOS
PRIVATE_DECLARATION PRIVATE_DECLARATION