------------------------------------------------------------
revno: 12600
revision-id: squid3@treenet.co.nz-20130726123840-1ii12zrzp3gy8318
parent: squid3@treenet.co.nz-20130726123437-3ik9p516xx6hb4i0
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Fri 2013-07-26 06:38:40 -0600
message:
  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.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20130726123840-1ii12zrzp3gy8318
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 5c2d2b8e42d89b58f6049fc8d4571ba36f3f6de4
# timestamp: 2013-07-26 12:43:57 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20130726123437-\
#   3ik9p516xx6hb4i0
# 
# Begin patch
=== modified file 'src/mgr/InfoAction.cc'
--- src/mgr/InfoAction.cc	2012-12-02 07:23:32 +0000
+++ src/mgr/InfoAction.cc	2013-07-26 12:38:40 +0000
@@ -115,7 +115,7 @@
     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;