From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 26 Jul 2013 03:12:33 +0000 (-0600)
Subject: Fix mgr:info report 'Largest file desc currently in use' with SMP
X-Git-Tag: SQUID_3_4_0_1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05f58b28b20a7d46535d08d4f88c1aaea785fc73;p=thirdparty%2Fsquid.git

Fix mgr:info report 'Largest file desc currently in use' with SMP

The biggest FD in use should not be the sum of biggest FD in each worker,
but the maximum across all workers.
---

diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc
index 09fb699df0..dc9e6c1df1 100644
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -115,7 +115,7 @@ Mgr::InfoActionData::operator += (const InfoActionData& stats)
     gb_saved_count += stats.gb_saved_count;
     gb_freed_count += stats.gb_freed_count;
     max_fd += stats.max_fd;
-    biggest_fd += stats.biggest_fd;
+    biggest_fd = max(biggest_fd, stats.biggest_fd);
     number_fd += stats.number_fd;
     opening_fd += stats.opening_fd;
     num_fd_free += stats.num_fd_free;