diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18bed85f..0053e505 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,11 +259,11 @@ if(INTROSPECTION)
else()
message(STATUS "Building PIP without introspection")
endif()
-if ((NOT _PIP_SAVED_DEFS) OR (NOT "x${_PIP_SAVED_DEFS}" STREQUAL "x${_PIP_DEFS}"))
+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")
if (NOT "x${_PIP_DEFS}" STREQUAL "x")
- file(APPEND "${PIP_SRC_MAIN}/pip_defs.h" "#define ${_PIP_DEFS}\n")
+ file(APPEND "${PIP_SRC_MAIN}/pip_defs.h" "#ifndef ${_PIP_DEFS}\n# define ${_PIP_DEFS}\n#endif\n")
endif()
endif()
list(APPEND HDRS "${PIP_SRC_MAIN}/pip_defs.h")
diff --git a/src_main/console/piconsole.cpp b/src_main/console/piconsole.cpp
index 2e00290d..9d4265e1 100644
--- a/src_main/console/piconsole.cpp
+++ b/src_main/console/piconsole.cpp
@@ -845,14 +845,14 @@ void PIConsole::addVariable(const PIString & name, const PIDiagnostics * ptr, in
}
void PIConsole::addVariable(const PIString & name, const PISystemMonitor * ptr, int col, FormatFlags format) {
addString("monitor " + name, col, format | PIConsole::Bold);
- addVariable("PID", &(ptr->statistic().ID), col, format);
+ //addVariable("PID", &(ptr->statistic().ID), col, format);
//addVariable("state", &(ptr->statistic().state), col, format);
- addVariable("threads", &(ptr->statistic().threads), col, format);
- addVariable("priority", &(ptr->statistic().priority), col, format);
- addVariable("memory physical", &(ptr->statistic().physical_memsize_readable), col, format);
- addVariable("memory shared", &(ptr->statistic().share_memsize_readable), col, format);
- addVariable("cpu load kernel", &(ptr->statistic().cpu_load_system), col, format);
- addVariable("cpu load user", &(ptr->statistic().cpu_load_user), col, format);
+ //addVariable("threads", &(ptr->statistic().threads), col, format);
+ //addVariable("priority", &(ptr->statistic().priority), col, format);
+ //addVariable("memory physical", &(ptr->statistic().physical_memsize_readable), col, format);
+ //addVariable("memory shared", &(ptr->statistic().share_memsize_readable), col, format);
+ //addVariable("cpu load kernel", &(ptr->statistic().cpu_load_system), col, format);
+ //addVariable("cpu load user", &(ptr->statistic().cpu_load_user), col, format);
}
void PIConsole::addBitVariable(const PIString & name, const void * ptr, int fromBit, int bitCount, int col, FormatFlags format) {
vid++; tv.id = vid; tv.size = sizeof(ullong); tv.name = name; tv.bitFrom = fromBit; tv.bitCount = bitCount; tv.type = 14; tv.ptr = ptr; tv.format = format;
diff --git a/src_main/introspection/piintrospection_base.h b/src_main/introspection/piintrospection_base.h
index 673e2db4..a2600813 100644
--- a/src_main/introspection/piintrospection_base.h
+++ b/src_main/introspection/piintrospection_base.h
@@ -28,6 +28,7 @@ class PIThread;
class PITimer;
class PIPeer;
class PIIntrospection;
+class PIIntrospectionServer;
#ifdef PIP_INTROSPECTION
#define __PIINTROSPECTION_SINGLETON_H__(T) \
diff --git a/src_main/introspection/piintrospection_containers.h b/src_main/introspection/piintrospection_containers.h
index fc6e8231..9baffc77 100644
--- a/src_main/introspection/piintrospection_containers.h
+++ b/src_main/introspection/piintrospection_containers.h
@@ -23,13 +23,6 @@
#include "piintrospection_base.h"
-//#if defined(__PIIS__)
-//# undef __PIIS__
-//#endif
-//# if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
-//#endif
-
-
#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
class PIIntrospectionContainers;
diff --git a/src_main/introspection/piintrospection_containers_p.cpp b/src_main/introspection/piintrospection_containers_p.cpp
index 4d0ea863..024d1ebb 100644
--- a/src_main/introspection/piintrospection_containers_p.cpp
+++ b/src_main/introspection/piintrospection_containers_p.cpp
@@ -17,8 +17,6 @@
along with this program. If not, see .
*/
-#ifdef PIP_INTROSPECTION
-
#include "piintrospection_containers_p.h"
#include
@@ -95,9 +93,9 @@ uint PIIntrospectionContainers::typeID(const char * tn) {
-PIByteArray & operator <<(PIByteArray & s, const std::unordered_map & v) {
+PIByteArray & operator <<(PIByteArray & s, const std::map & v) {
PIMap m;
- for (typename std::unordered_map::const_iterator i = v.cbegin(); i != v.cend(); ++i) {
+ for (typename std::map::const_iterator i = v.cbegin(); i != v.cend(); ++i) {
m[i->first] = PIStringAscii(i->second.c_str());
}
s << m;
@@ -113,5 +111,3 @@ PIByteArray & operator >>(PIByteArray & s, PIIntrospectionContainers::Type & v)
s >> v.count >> v.items >> v.bytes_allocated >> v.bytes_used;
return s;
}
-
-#endif //PIP_INTROSPECTION
diff --git a/src_main/introspection/piintrospection_containers_p.h b/src_main/introspection/piintrospection_containers_p.h
index f483372d..686a7f68 100644
--- a/src_main/introspection/piintrospection_containers_p.h
+++ b/src_main/introspection/piintrospection_containers_p.h
@@ -20,10 +20,8 @@
#ifndef PIINTROSPECTION_CONTAINERS_P_H
#define PIINTROSPECTION_CONTAINERS_P_H
-#ifdef PIP_INTROSPECTION
-
#include "pimutex.h"
-#include
+#include