resurrect and assertions

2021-06-09 11:32:28 +03:00
parent 6af21622a1
commit d71432136c
7 changed files with 1621 additions and 1578 deletions
--- a/libs/main/introspection/piintrospection_server.h
+++ b/libs/main/introspection/piintrospection_server.h
@@ -1,61 +1,61 @@
-/*
-	PIP - Platform Independent Primitives
-	Introspection module
-	Ivan Pelipenko peri4ko@yandex.ru
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Lesser General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PIINTROSPECTION_SERVER_H
-#define PIINTROSPECTION_SERVER_H
-
-
-#include "pipeer.h"
-
-#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
-
-class PIIntrospectionServer;
-class PISystemMonitor;
-
-#  define PIINTROSPECTION_SERVER (PIIntrospectionServer::instance())
-#  define PIINTROSPECTION_START PIINTROSPECTION_SERVER->start();
-
-class PIP_EXPORT PIIntrospectionServer: public PIPeer {
-	PIOBJECT_SUBCLASS(PIIntrospectionServer, PIPeer)
-public:
-	static PIIntrospectionServer * instance() {static PIIntrospectionServer ret; return &ret;}
-
-	void start();
-
-private:
-	PIIntrospectionServer();
-	~PIIntrospectionServer();
-	NO_COPY_CLASS(PIIntrospectionServer)
-
-	PIString genName();
-	virtual void dataReceived(const PIString & from, const PIByteArray & data);
-	EVENT_HANDLER(void, sysmonDeleted);
-
-	PRIVATE_DECLARATION
-	PITimer itimer;
-	PISystemMonitor * sysmon;
-	PIMutex sysmon_mutex;
-
-};
-
-#else
-#  define PIINTROSPECTION_START
-#endif
-
-#endif // PIINTROSPECTION_SERVER_H
+/*
+	PIP - Platform Independent Primitives
+	Introspection module
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIINTROSPECTION_SERVER_H
+#define PIINTROSPECTION_SERVER_H
+
+
+#include "pipeer.h"
+
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
+
+class PIIntrospectionServer;
+class PISystemMonitor;
+
+#  define PIINTROSPECTION_SERVER (PIIntrospectionServer::instance())
+#  define PIINTROSPECTION_START(name) PIINTROSPECTION_SERVER->start(#name);
+
+class PIP_EXPORT PIIntrospectionServer: public PIPeer {
+	PIOBJECT_SUBCLASS(PIIntrospectionServer, PIPeer)
+public:
+	static PIIntrospectionServer * instance();
+
+	void start(const PIString & server_name);
+
+private:
+	PIIntrospectionServer();
+	~PIIntrospectionServer();
+	NO_COPY_CLASS(PIIntrospectionServer)
+
+	PIString genName();
+	virtual void dataReceived(const PIString & from, const PIByteArray & data);
+	EVENT_HANDLER(void, sysmonDeleted);
+
+	PRIVATE_DECLARATION(PIP_EXPORT)
+	PITimer itimer;
+	PISystemMonitor * sysmon;
+	PIMutex sysmon_mutex;
+
+};
+
+#else
+#  define PIINTROSPECTION_START(name)
+#endif
+
+#endif // PIINTROSPECTION_SERVER_H