From 58be6d0a3aad64bce2df1e443c6ddd029de5ef21 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Tue, 15 Oct 2019 08:49:41 +0800
Subject: [PATCH] tracker_get(close)_all_connections without connection pool

---
 client/tracker_client.c |  4 ++--
 make.sh                 |  3 ++-
 tracker/tracker_proto.c | 18 ++++++++++++++++++
 tracker/tracker_proto.h |  2 ++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/client/tracker_client.c b/client/tracker_client.c
index 56a24ba..bbd7ceb 100644
--- a/client/tracker_client.c
+++ b/client/tracker_client.c
@@ -38,7 +38,7 @@ int tracker_get_all_connections_ex(TrackerServerGroup *pTrackerGroup)
 	pEnd = pTrackerGroup->servers + pTrackerGroup->server_count;
 	for (pServer=pTrackerGroup->servers; pServer<pEnd; pServer++)
 	{
-		if ((conn=tracker_connect_server(pServer, &result)) != NULL)
+		if ((conn=tracker_connect_server_no_pool(pServer, &result)) != NULL)
 		{
 			fdfs_active_test(conn);
 			success_count++;
@@ -56,7 +56,7 @@ void tracker_close_all_connections_ex(TrackerServerGroup *pTrackerGroup)
 	pEnd = pTrackerGroup->servers + pTrackerGroup->server_count;
 	for (pServer=pTrackerGroup->servers; pServer<pEnd; pServer++)
 	{
-		tracker_disconnect_server(pServer);
+		tracker_disconnect_server_no_pool(pServer);
 	}
 }
 
diff --git a/make.sh b/make.sh
index 1294ef6..86f9318 100755
--- a/make.sh
+++ b/make.sh
@@ -1,6 +1,7 @@
 ENABLE_STATIC_LIB=0
 ENABLE_SHARED_LIB=1
-TARGET_PREFIX=$DESTDIR/usr
+DESTDIR=/usr/local
+TARGET_PREFIX=$DESTDIR
 TARGET_CONF_PATH=$DESTDIR/etc/fdfs
 TARGET_INIT_PATH=$DESTDIR/etc/init.d
 
diff --git a/tracker/tracker_proto.c b/tracker/tracker_proto.c
index 0e646b3..3e737b7 100644
--- a/tracker/tracker_proto.c
+++ b/tracker/tracker_proto.c
@@ -555,6 +555,24 @@ void tracker_disconnect_server(TrackerServerInfo *pServerInfo)
     }
 }
 
+void tracker_disconnect_server_no_pool(TrackerServerInfo *pServerInfo)
+{
+	ConnectionInfo *conn;
+	ConnectionInfo *end;
+
+    if (pServerInfo->count == 1)
+    {
+        conn_pool_disconnect_server(pServerInfo->connections + 0);
+        return;
+    }
+
+	end = pServerInfo->connections + pServerInfo->count;
+	for (conn=pServerInfo->connections; conn<end; conn++)
+    {
+        conn_pool_disconnect_server(conn);
+    }
+}
+
 static int fdfs_do_parameter_req(ConnectionInfo *pTrackerServer, \
 	char *buff, const int buff_size)
 {
diff --git a/tracker/tracker_proto.h b/tracker/tracker_proto.h
index 36d2f99..0ee94b7 100644
--- a/tracker/tracker_proto.h
+++ b/tracker/tracker_proto.h
@@ -271,6 +271,8 @@ void tracker_close_connection_ex(ConnectionInfo *conn, \
 
 void tracker_disconnect_server(TrackerServerInfo *pServerInfo);
 
+void tracker_disconnect_server_no_pool(TrackerServerInfo *pServerInfo);
+
 ConnectionInfo *tracker_make_connection_ex(ConnectionInfo *conn,
 		const int connect_timeout, int *err_no);