PIEthernet fix tcp-server close (properly delete all clients)

PIEthernet::stopThreadedListen() method
decompose client to 2 implementations - server-side and client-side

libs/main/client_server/piclientserver_client.h

@@ -0,0 +1,69 @@
+/*! \file piclientserver_client.h
+ * \ingroup ClientServer
+ * \~\brief
+ * \~english
+ * \~russian
+ */
+/*
+    PIP - Platform Independent Primitives
+	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 piclientserver_client_H
+#define piclientserver_client_H
+
+#include "piclientserver_client_base.h"
+
+
+namespace PIClientServer {
+
+
+// ServerClient
+
+class PIP_CLIENT_SERVER_EXPORT ServerClient: public ClientBase {
+	friend class Server;
+	NO_COPY_CLASS(ServerClient);
+
+public:
+	ServerClient() {}
+
+protected:
+	virtual void aboutDelete() {}
+
+private:
+	void createForServer(PIEthernet * tcp_);
+};
+
+
+// Client
+
+class PIP_CLIENT_SERVER_EXPORT Client: public ClientBase {
+	NO_COPY_CLASS(Client);
+
+public:
+	Client();
+	~Client();
+
+	void connect(PINetworkAddress addr);
+
+protected:
+
+private:
+};
+
+} // namespace PIClientServer
+
+#endif

libs/main/client_server/piclientserver_client_base.h

@@ -1,4 +1,4 @@
-/*! \file piclient_server_client.h
+/*! \file piclientserver_client_base.h
  * \ingroup ClientServer
  * \~\brief
  * \~english
@@ -22,8 +22,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef piclient_server_client_H
-#define piclient_server_client_H
+#ifndef piclientserver_client_base_H
+#define piclientserver_client_base_H
 
 #include "pinetworkaddress.h"
 #include "pip_client_server_export.h"
@@ -35,18 +35,14 @@ namespace PIClientServer {
 
 class Server;
 
-class PIP_CLIENT_SERVER_EXPORT Client: public PIObject {
+class PIP_CLIENT_SERVER_EXPORT ClientBase {
 	friend class Server;
-	NO_COPY_CLASS(Client);
-	PIOBJECT(Client);
+	NO_COPY_CLASS(ClientBase);
 
 public:
-	Client();
-	virtual ~Client();
+	ClientBase();
+	virtual ~ClientBase();
 
-	void createNew();
-
-	void connect(PINetworkAddress addr);
 	const PIEthernet * getTCP() const { return tcp; }
 
 	void stop();
@@ -60,19 +56,18 @@ protected:
 	virtual void readed(PIByteArray data) {}
 	virtual void connected() {}
 	virtual void disconnected() {}
-	virtual void aboutDelete() {}
 
-private:
-	void createForServer(PIEthernet * tcp_);
 	void init();
-	void destroy();
 
 	bool own_tcp               = false;
 	std::atomic_bool can_write = {true};
 	PIEthernet * tcp           = nullptr;
+
+private:
+	void destroy();
+
 	PIStreamPacker stream;
 	mutable PIMutex write_mutex;
-	std::function<void(PIByteArray data)> readed_func = nullptr;
 };
 
 } // namespace PIClientServer

libs/main/client_server/piclientserver_server.h

@@ -1,4 +1,4 @@
-/*! \file piclient_server_server.h
+/*! \file piclientserver_server.h
  * \ingroup ClientServer
  * \~\brief
  * \~english
@@ -22,8 +22,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef piclient_server_server_H
-#define piclient_server_server_H
+#ifndef piclientserver_server_H
+#define piclientserver_server_H
 
 #include "pimutex.h"
 #include "pinetworkaddress.h"
@@ -34,7 +34,7 @@ class PIThread;
 
 namespace PIClientServer {
 
-class Client;
+class ServerClient;
 
 class PIP_CLIENT_SERVER_EXPORT Server {
 public:
@@ -46,24 +46,24 @@ public:
 
 	int getMaxClients() const { return max_clients; }
 	void setMaxClients(int new_max_clients);
+	int clientsCount() const;
+	void forEachClient(std::function<void(ServerClient *)> func);
 
-	void setClientFactory(std::function<Client *()> f) { client_factory = f; }
+	void setClientFactory(std::function<ServerClient *()> f) { client_factory = f; }
 
 	void enableSymmetricEncryption(const PIByteArray & key);
 
-protected:
-	virtual void readed(Client * c, PIByteArray data) {}
-
 private:
 	void stopServer();
-	void newClient(Client * c);
+	void newClient(ServerClient * c);
 
-	std::function<Client *()> client_factory;
-	PIEthernet * tcp_server = nullptr;
-	PIThread * clean_thread = nullptr;
+	std::function<ServerClient *()> client_factory;
+	std::atomic_bool is_closing = {false};
+	PIEthernet * tcp_server     = nullptr;
+	PIThread * clean_thread     = nullptr;
 	PIByteArray crypt_key;
-	PIVector<Client *> clients;
-	PIMutex clients_mutex;
+	PIVector<ServerClient *> clients;
+	mutable PIMutex clients_mutex;
 
 	int max_clients = 1000;
 };

libs/main/io_devices/piethernet.cpp

@@ -303,18 +303,12 @@ bool PIEthernet::closeDevice() {
 	// piCoutObj << "close";
 	bool ned   = connected_;
 	connected_ = connecting_ = false;
-	server_thread_.stop();
-	PRIVATE->event.interrupt();
-	if (server_thread_.isRunning()) {
-		if (!server_thread_.waitForFinish(1_s)) server_thread_.terminate();
-	}
-	PRIVATE->event.destroy();
-	if (sock_s == sock) sock_s = -1;
-	closeSocket(sock);
-	closeSocket(sock_s);
+	stopThreadedListen();
 	clients_mutex.lock();
-	piDeleteAllAndClear(clients_);
+	auto cl = clients_;
+	clients_.clear();
 	clients_mutex.unlock();
+	piDeleteAll(cl);
 	if (ned) {
 		// piCoutObj << "Disconnect on close";
 		disconnected(false);
@@ -528,16 +522,32 @@ bool PIEthernet::listen(const PINetworkAddress & addr, bool threaded) {
 	return listen(threaded);
 }
 
+
+void PIEthernet::stopThreadedListen() {
+	server_thread_.stop();
+	PRIVATE->event.interrupt();
+	if (server_thread_.isRunning()) {
+		if (!server_thread_.waitForFinish(1_s)) server_thread_.terminate();
+	}
+	PRIVATE->event.destroy();
+	if (sock_s == sock) sock_s = -1;
+	closeSocket(sock);
+	closeSocket(sock_s);
+}
+
+
 PIEthernet * PIEthernet::client(int index) {
 	PIMutexLocker locker(clients_mutex);
 	return clients_[index];
 }
 
+
 int PIEthernet::clientsCount() const {
 	PIMutexLocker locker(clients_mutex);
 	return clients_.size_s();
 }
 
+
 PIVector<PIEthernet *> PIEthernet::clients() const {
 	PIMutexLocker locker(clients_mutex);
 	return clients_;

libs/main/io_devices/piethernet.h

@@ -251,6 +251,8 @@ public:
 	//! Start listen for incoming TCP connections on address "addr". Use only for TCP_Server
 	bool listen(const PINetworkAddress & addr, bool threaded = false);
 
+	void stopThreadedListen();
+
 	PIEthernet * client(int index);
 	int clientsCount() const;
 	PIVector<PIEthernet *> clients() const;

libs/main/io_devices/piiodevice.h

@@ -243,6 +243,10 @@ public:
 	//! \~russian Возвращает запущен ли поток чтения
 	bool isThreadedRead() const;
 
+	//! \~english Returns if threaded read is stopping
+	//! \~russian Возвращает останавливается ли поток чтения
+	bool isThreadedReadStopping() const { return read_thread.isStopping(); }
+
 	//! \~english Start threaded read
 	//! \~russian Запускает потоковое чтение
 	void startThreadedRead();
@@ -565,8 +569,6 @@ protected:
 
 	static PIIODevice * newDeviceByPrefix(const char * prefix);
 
-	bool isThreadedReadStopping() const { return read_thread.isStopping(); }
-
 	DeviceMode mode_ = ReadOnly;
 	DeviceOptions options_;
 	ReadRetFunc func_read = nullptr;