From d3b915559485040a7d627b01785b6126dd55a68b 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, 26 Jun 2019 17:01:34 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@817 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/introspection/piintrospection_base.h | 3 +- .../piintrospection_containers.cpp | 4 +++ .../piintrospection_containers.h | 29 +++++++++++-------- .../piintrospection_containers_p.cpp | 4 +++ .../piintrospection_containers_p.h | 3 ++ .../introspection/piintrospection_server.cpp | 5 ++++ .../introspection/piintrospection_server.h | 14 +++++---- .../piintrospection_server_p.cpp | 4 +++ .../introspection/piintrospection_server_p.h | 3 ++ .../introspection/piintrospection_threads.cpp | 4 +++ .../introspection/piintrospection_threads.h | 23 ++++++++------- .../piintrospection_threads_p.cpp | 4 +++ .../introspection/piintrospection_threads_p.h | 3 ++ 13 files changed, 74 insertions(+), 29 deletions(-) diff --git a/src_main/introspection/piintrospection_base.h b/src_main/introspection/piintrospection_base.h index ee82c158..673e2db4 100644 --- a/src_main/introspection/piintrospection_base.h +++ b/src_main/introspection/piintrospection_base.h @@ -29,6 +29,7 @@ class PITimer; class PIPeer; class PIIntrospection; +#ifdef PIP_INTROSPECTION #define __PIINTROSPECTION_SINGLETON_H__(T) \ static PIIntrospection##T##Interface * instance(); @@ -37,5 +38,5 @@ class PIIntrospection; static PIIntrospection##T##Interface ret;\ return &ret;\ } - +#endif // PIP_INTROSPECTION #endif // PIINTROSPECTION_BASE_H diff --git a/src_main/introspection/piintrospection_containers.cpp b/src_main/introspection/piintrospection_containers.cpp index 6c7cdc21..f793d127 100644 --- a/src_main/introspection/piintrospection_containers.cpp +++ b/src_main/introspection/piintrospection_containers.cpp @@ -20,6 +20,8 @@ #include "piintrospection_containers.h" #include "piintrospection_containers_p.h" +#ifdef PIP_INTROSPECTION + __PIINTROSPECTION_SINGLETON_CPP__(Containers) @@ -61,3 +63,5 @@ void PIIntrospectionContainersInterface::containerUsed(const char * tn, ullong c void PIIntrospectionContainersInterface::containerUnused(const char * tn, ullong cnt) { p->containerUnused(tn, cnt); } + +#endif diff --git a/src_main/introspection/piintrospection_containers.h b/src_main/introspection/piintrospection_containers.h index fe6fdd63..fc6e8231 100644 --- a/src_main/introspection/piintrospection_containers.h +++ b/src_main/introspection/piintrospection_containers.h @@ -22,9 +22,6 @@ #include "piintrospection_base.h" -class PIIntrospectionContainers; - -#define PIINTROSPECTION_CONTAINERS (PIIntrospectionContainersInterface::instance())//(PIIntrospectionContainersInterface::instance()) //#if defined(__PIIS__) //# undef __PIIS__ @@ -32,6 +29,12 @@ class PIIntrospectionContainers; //# if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION) //#endif + +#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION) +class PIIntrospectionContainers; + +#define PIINTROSPECTION_CONTAINERS (PIIntrospectionContainersInterface::instance())//(PIIntrospectionContainersInterface::instance()) + #ifdef CC_GCC # include # define _PIIS_TYPENAME_(t) typeid(t).name() @@ -39,21 +42,12 @@ class PIIntrospectionContainers; # define _PIIS_TYPENAME_(t) "" #endif -#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION) # define PIINTROSPECTION_CONTAINER_NEW(t) PIINTROSPECTION_CONTAINERS->containerNew (_PIIS_TYPENAME_(t)); # define PIINTROSPECTION_CONTAINER_DELETE(t) PIINTROSPECTION_CONTAINERS->containerDelete(_PIIS_TYPENAME_(t)); # define PIINTROSPECTION_CONTAINER_ALLOC(t, cnt) PIINTROSPECTION_CONTAINERS->containerAlloc (_PIIS_TYPENAME_(t), cnt); # define PIINTROSPECTION_CONTAINER_FREE(t, cnt) PIINTROSPECTION_CONTAINERS->containerFree (_PIIS_TYPENAME_(t), cnt); # define PIINTROSPECTION_CONTAINER_USED(t, cnt) PIINTROSPECTION_CONTAINERS->containerUsed (_PIIS_TYPENAME_(t), cnt); # define PIINTROSPECTION_CONTAINER_UNUSED(t, cnt) PIINTROSPECTION_CONTAINERS->containerUnused(_PIIS_TYPENAME_(t), cnt); -#else -# define PIINTROSPECTION_CONTAINER_NEW(t) -# define PIINTROSPECTION_CONTAINER_DELETE(t) -# define PIINTROSPECTION_CONTAINER_ALLOC(t, cnt) -# define PIINTROSPECTION_CONTAINER_FREE(t, cnt) -# define PIINTROSPECTION_CONTAINER_USED(t, cnt) -# define PIINTROSPECTION_CONTAINER_UNUSED(t, cnt) -#endif class PIP_EXPORT PIIntrospectionContainersInterface { @@ -78,4 +72,15 @@ private: }; +#else +# define PIINTROSPECTION_CONTAINER_NEW(t) +# define PIINTROSPECTION_CONTAINER_DELETE(t) +# define PIINTROSPECTION_CONTAINER_ALLOC(t, cnt) +# define PIINTROSPECTION_CONTAINER_FREE(t, cnt) +# define PIINTROSPECTION_CONTAINER_USED(t, cnt) +# define PIINTROSPECTION_CONTAINER_UNUSED(t, cnt) +#endif + + + #endif // PIINTROSPECTION_CONTAINERS_H diff --git a/src_main/introspection/piintrospection_containers_p.cpp b/src_main/introspection/piintrospection_containers_p.cpp index 8b8b950b..4d0ea863 100644 --- a/src_main/introspection/piintrospection_containers_p.cpp +++ b/src_main/introspection/piintrospection_containers_p.cpp @@ -17,6 +17,8 @@ along with this program. If not, see . */ +#ifdef PIP_INTROSPECTION + #include "piintrospection_containers_p.h" #include @@ -111,3 +113,5 @@ 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 7bdeb40b..f483372d 100644 --- a/src_main/introspection/piintrospection_containers_p.h +++ b/src_main/introspection/piintrospection_containers_p.h @@ -20,6 +20,8 @@ #ifndef PIINTROSPECTION_CONTAINERS_P_H #define PIINTROSPECTION_CONTAINERS_P_H +#ifdef PIP_INTROSPECTION + #include "pimutex.h" #include #include @@ -58,4 +60,5 @@ PIByteArray & operator <<(PIByteArray & s, const std::unordered_map>(PIByteArray & s, PIIntrospectionContainers::Type & v); +#endif // PIP_INTROSPECTION #endif // PIINTROSPECTION_CONTAINERS_P_H diff --git a/src_main/introspection/piintrospection_server.cpp b/src_main/introspection/piintrospection_server.cpp index f6b54ce8..262fae00 100644 --- a/src_main/introspection/piintrospection_server.cpp +++ b/src_main/introspection/piintrospection_server.cpp @@ -17,6 +17,8 @@ along with this program. If not, see . */ +#ifdef PIP_INTROSPECTION + #include "piintrospection_server.h" #include "piintrospection_server_p.h" #include "pichunkstream.h" @@ -69,3 +71,6 @@ void PIIntrospectionServer::dataReceived(const PIString & from, const PIByteArra ba.append(cs.data()); send(from, ba); } + +#endif // PIP_INTROSPECTION + diff --git a/src_main/introspection/piintrospection_server.h b/src_main/introspection/piintrospection_server.h index d6546e9e..d65d5ef0 100644 --- a/src_main/introspection/piintrospection_server.h +++ b/src_main/introspection/piintrospection_server.h @@ -20,17 +20,15 @@ #ifndef PIINTROSPECTION_SERVER_H #define PIINTROSPECTION_SERVER_H + #include "pipeer.h" +#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION) + class PIIntrospectionServer; -#define PIINTROSPECTION_SERVER (PIIntrospectionServer::instance()) - -#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION) +# define PIINTROSPECTION_SERVER (PIIntrospectionServer::instance()) # define PIINTROSPECTION_START PIINTROSPECTION_SERVER->start(); -#else -# define PIINTROSPECTION_START -#endif class PIP_EXPORT PIIntrospectionServer: public PIPeer { PIOBJECT_SUBCLASS(PIIntrospectionServer, PIPeer) @@ -51,4 +49,8 @@ private: PITimer itimer; }; +#else +# define PIINTROSPECTION_START +#endif + #endif // PIINTROSPECTION_SERVER_H diff --git a/src_main/introspection/piintrospection_server_p.cpp b/src_main/introspection/piintrospection_server_p.cpp index ac829941..3e0fbf9f 100644 --- a/src_main/introspection/piintrospection_server_p.cpp +++ b/src_main/introspection/piintrospection_server_p.cpp @@ -17,6 +17,8 @@ along with this program. If not, see . */ +#ifdef PIP_INTROSPECTION + #include "piintrospection_server_p.h" #include "pichunkstream.h" #include "piinit.h" @@ -237,3 +239,5 @@ void PIIntrospection::unpackObjects(PIByteArray & ba, PIVector> objects; } + +#endif // PIP_INTROSPECTION diff --git a/src_main/introspection/piintrospection_server_p.h b/src_main/introspection/piintrospection_server_p.h index 4b734e99..b3c06024 100644 --- a/src_main/introspection/piintrospection_server_p.h +++ b/src_main/introspection/piintrospection_server_p.h @@ -20,6 +20,8 @@ #ifndef PIINTROSPECTION_SERVER_P_H #define PIINTROSPECTION_SERVER_P_H +#ifdef PIP_INTROSPECTION + #include "piintrospection_containers.h" #include "piintrospection_containers_p.h" #include "piintrospection_threads.h" @@ -91,4 +93,5 @@ PIByteArray & operator >>(PIByteArray & b, PIIntrospection::ProcessInfo & v); PIByteArray & operator <<(PIByteArray & b, const PIIntrospection::ObjectInfo & v); PIByteArray & operator >>(PIByteArray & b, PIIntrospection::ObjectInfo & v); +#endif // PIP_INTROSPECTION #endif // PIINTROSPECTION_SERVER_P_H diff --git a/src_main/introspection/piintrospection_threads.cpp b/src_main/introspection/piintrospection_threads.cpp index 6ce5d2f0..09acb45b 100644 --- a/src_main/introspection/piintrospection_threads.cpp +++ b/src_main/introspection/piintrospection_threads.cpp @@ -17,6 +17,8 @@ along with this program. If not, see . */ +#ifdef PIP_INTROSPECTION + #include "piintrospection_threads.h" #include "piintrospection_threads_p.h" @@ -66,3 +68,5 @@ void PIIntrospectionThreadsInterface::threadStop(PIThread * t) { void PIIntrospectionThreadsInterface::threadRunDone(PIThread * t, ullong us) { p->threadRunDone(t, us); } + +#endif // PIP_INTROSPECTION diff --git a/src_main/introspection/piintrospection_threads.h b/src_main/introspection/piintrospection_threads.h index f176c331..9d90d623 100644 --- a/src_main/introspection/piintrospection_threads.h +++ b/src_main/introspection/piintrospection_threads.h @@ -22,11 +22,13 @@ #include "piintrospection_base.h" + +#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION) + class PIIntrospectionThreads; #define PIINTROSPECTION_THREADS (PIIntrospectionThreadsInterface::instance()) -#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION) # define PIINTROSPECTION_THREAD_NEW(t) PIINTROSPECTION_THREADS->threadNew (t); # define PIINTROSPECTION_THREAD_DELETE(t) PIINTROSPECTION_THREADS->threadDelete (t); # define PIINTROSPECTION_THREAD_START(t) PIINTROSPECTION_THREADS->threadStart (t); @@ -34,15 +36,6 @@ class PIIntrospectionThreads; # define PIINTROSPECTION_THREAD_WAIT(t) PIINTROSPECTION_THREADS->threadWait (t); # define PIINTROSPECTION_THREAD_STOP(t) PIINTROSPECTION_THREADS->threadStop (t); # define PIINTROSPECTION_THREAD_RUN_DONE(t,us) PIINTROSPECTION_THREADS->threadRunDone(t,us); -#else -# define PIINTROSPECTION_THREAD_NEW(t) -# define PIINTROSPECTION_THREAD_DELETE(t) -# define PIINTROSPECTION_THREAD_START(t) -# define PIINTROSPECTION_THREAD_RUN(t) -# define PIINTROSPECTION_THREAD_WAIT(t) -# define PIINTROSPECTION_THREAD_STOP(t) -# define PIINTROSPECTION_THREAD_RUN_DONE(t,us) -#endif class PIP_EXPORT PIIntrospectionThreadsInterface { friend class PIIntrospection; @@ -65,4 +58,14 @@ private: }; +#else +# define PIINTROSPECTION_THREAD_NEW(t) +# define PIINTROSPECTION_THREAD_DELETE(t) +# define PIINTROSPECTION_THREAD_START(t) +# define PIINTROSPECTION_THREAD_RUN(t) +# define PIINTROSPECTION_THREAD_WAIT(t) +# define PIINTROSPECTION_THREAD_STOP(t) +# define PIINTROSPECTION_THREAD_RUN_DONE(t,us) +#endif + #endif // PIINTROSPECTION_THREADS_H diff --git a/src_main/introspection/piintrospection_threads_p.cpp b/src_main/introspection/piintrospection_threads_p.cpp index 52083cd0..68c7b938 100644 --- a/src_main/introspection/piintrospection_threads_p.cpp +++ b/src_main/introspection/piintrospection_threads_p.cpp @@ -17,6 +17,8 @@ along with this program. If not, see . */ +#ifdef PIP_INTROSPECTION + #include "piintrospection_threads_p.h" @@ -98,3 +100,5 @@ PIByteArray & operator >>(PIByteArray & b, PIIntrospectionThreads::ThreadInfo & v.state = (PIIntrospectionThreads::ThreadState)st; return b; } + +#endif // PIP_INTROSPECTION diff --git a/src_main/introspection/piintrospection_threads_p.h b/src_main/introspection/piintrospection_threads_p.h index b63e199e..de53b6d6 100644 --- a/src_main/introspection/piintrospection_threads_p.h +++ b/src_main/introspection/piintrospection_threads_p.h @@ -20,6 +20,8 @@ #ifndef PIINTROSPECTION_THREADS_P_H #define PIINTROSPECTION_THREADS_P_H +#ifdef PIP_INTROSPECTION + #include "pimap.h" #include "pithread.h" @@ -60,4 +62,5 @@ public: PIByteArray & operator <<(PIByteArray & b, const PIIntrospectionThreads::ThreadInfo & v); PIByteArray & operator >>(PIByteArray & b, PIIntrospectionThreads::ThreadInfo & v); +#endif // PIP_INTROSPECTION #endif // PIINTROSPECTION_THREADS_P_H