Merged changes from SQUID_3_0

diff --git a/src/fd.cc b/src/fd.cc
index 12ee236e1df4cd89b3033a1f996d5b2902178bba..2e7de6497e27953444d9921f8e18f7cf129077da 100644 (file)
--- a/src/fd.cc
+++ b/src/fd.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fd.cc,v 1.59 2007/09/25 13:24:59 hno Exp $
+ * $Id: fd.cc,v 1.59.4.1 2008/03/02 13:37:08 serassio Exp $
  *
  * DEBUG: section 51    Filedescriptor Functions
  * AUTHOR: Duane Wessels
@@ -113,9 +113,9 @@ int
 socket_read_method(int fd, char *buf, int len)
 {
     int i;
-    PROF_start(send);
+    PROF_start(recv);
     i = recv(fd, (void *) buf, len, 0);
-    PROF_stop(send);
+    PROF_stop(recv);
     return i;
 }
 
@@ -142,7 +142,11 @@ socket_write_method(int fd, const char *buf, int len)
 int
 file_write_method(int fd, const char *buf, int len)
 {
-    return (_write(fd, buf, len));
+    int i;
+    PROF_start(write);
+    i = (_write(fd, buf, len));
+    PROF_stop(write);
+    return i;
 }
 
 #else

diff --git a/src/stat.cc b/src/stat.cc
index b63a557ce8fbc269a7dfb257086ce3983cc8ada1..6ae6cac5c38181db458eda6bc4bae41ade57c031 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: stat.cc,v 1.410.4.1 2008/02/29 18:30:04 serassio Exp $
+ * $Id: stat.cc,v 1.410.4.2 2008/03/02 13:37:08 serassio Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -544,9 +544,9 @@ info_get(StoreEntry * sentry)
                       dpercent(store_swap_size, Store::Root().maxSize()),  
                       dpercent((Store::Root().maxSize() - store_swap_size), Store::Root().maxSize()));
 
-
-    storeAppendPrintf(sentry, "\tStorage Mem size:\t%d KB\n",
-                      mem_node::StoreMemSize() >> 10);
+   
+    storeAppendPrintf(sentry, "\tStorage Mem size:\t%lu KB\n",
+                      (unsigned long)mem_node::StoreMemSize() >> 10);
 
     storeAppendPrintf(sentry, "\tStorage Mem capacity:\t%4.1f%% used, %4.1f%% free\n",
                       dpercent(mem_node::InUseCount(), store_pages_max),