From f614a956a7a772a1ceb9581ab4dd74aaa114d583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 27 Jun 2019 11:44:36 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@821 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 7 ++++--- src_main/system/pisystemmonitor.cpp | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0053e505..c095c503 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,6 +251,7 @@ endif() # Check if PIP should be built with introspection set(_PIP_DEFS "") +set(_PIP_DEFS_FILE "${CMAKE_CURRENT_BINARY_DIR}/pip_defs.h") if(INTROSPECTION) message(STATUS "Building PIP with introspection") message(STATUS "Warning: Introspection reduces the performance!") @@ -261,12 +262,12 @@ else() endif() if ((NOT DEFINED _PIP_SAVED_DEFS) OR (NOT "x${_PIP_SAVED_DEFS}" STREQUAL "x${_PIP_DEFS}")) set(_PIP_SAVED_DEFS "${_PIP_DEFS}" CACHE STRING "pip_defs" FORCE) - file(WRITE "${PIP_SRC_MAIN}/pip_defs.h" "// This file was generated by PIP CMake, don`t edit it!\n") + file(WRITE ${_PIP_DEFS_FILE} "// This file was generated by PIP CMake, don`t edit it!\n") if (NOT "x${_PIP_DEFS}" STREQUAL "x") - file(APPEND "${PIP_SRC_MAIN}/pip_defs.h" "#ifndef ${_PIP_DEFS}\n# define ${_PIP_DEFS}\n#endif\n") + file(APPEND ${_PIP_DEFS_FILE} "#ifndef ${_PIP_DEFS}\n# define ${_PIP_DEFS}\n#endif\n") endif() endif() -list(APPEND HDRS "${PIP_SRC_MAIN}/pip_defs.h") +list(APPEND HDRS ${_PIP_DEFS_FILE}) #message("${_PIP_DEFS_CHANGED}") diff --git a/src_main/system/pisystemmonitor.cpp b/src_main/system/pisystemmonitor.cpp index 9051949c..09ffcc0f 100755 --- a/src_main/system/pisystemmonitor.cpp +++ b/src_main/system/pisystemmonitor.cpp @@ -395,7 +395,7 @@ void PISystemMonitor::gatherThread(llong id) { PIStringList sl = str.split(" "); if (sl.size_s() < 14) return; //piCout << sl[0] << sl[12] << sl[13]; - ts.work_time = ct - ts.created.toSystemTime(); + //ts.work_time = ct - ts.created.toSystemTime(); ts.user_time = PISystemTime::fromMilliseconds(sl[12].toInt() * 10.); ts.kernel_time = PISystemTime::fromMilliseconds(sl[13].toInt() * 10.); # else