Making HEAD 64bit clean on amd64/FreeBSD64... (Modified by Sean Chittenden)

From: Sean Chittenden <sean@dont-contact.us>
Date: Sun, 27 Feb 2005 23:05:09 -0800

Howdy. Two things.

1) Attached patch lets squid compile on amd64/FreeBSD 5-STABLE. Could
someone commit this? The debug() statements need a bit of work,
however since I just cast them to int.

2) Has anyone had any instability problems with 3-HEAD, amd64, and
kqueue(2) on FreeBSD 5-CURRENT? I'm noticing strange behavior under
high load (30+Mbps).

-sc

Index: src/mem.cc
===================================================================
RCS file: /squid/squid3/src/mem.cc,v
retrieving revision 1.85
diff -u -u -r1.85 mem.cc
--- src/mem.cc 30 Aug 2004 05:12:31 -0000 1.85
+++ src/mem.cc 28 Feb 2005 06:49:19 -0000
@@ -397,7 +397,7 @@
          StrPools[i].pool =
MemPools::GetInstance().create(StrPoolsAttrs[i].name,
StrPoolsAttrs[i].obj_size);

          if (StrPools[i].pool->objectSize() !=
StrPoolsAttrs[i].obj_size)
- debug(13, 1) ("Notice: %s is %d bytes instead of requested
%d bytes\n", StrPoolsAttrs[i].name, StrPoolsAttrs[i].obj_size,
StrPoolsAttrs[i].obj_size);
+ debug(13, 1) ("Notice: %s is %d bytes instead of requested
%d bytes\n", StrPoolsAttrs[i].name, (int)StrPoolsAttrs[i].obj_size,
(int)StrPoolsAttrs[i].obj_size);
      }

      cachemgrRegister("mem",
Index: src/store_dir.cc
===================================================================
RCS file: /squid/squid3/src/store_dir.cc,v
retrieving revision 1.150
diff -u -u -r1.150 store_dir.cc
--- src/store_dir.cc 3 Jan 2005 16:08:26 -0000 1.150
+++ src/store_dir.cc 28 Feb 2005 06:49:19 -0000
@@ -859,7 +859,7 @@
  }

  void
-StoreHashIndex::updateSize(unsigned int, int)
+StoreHashIndex::updateSize(size_t, int)
  {}

  void
Index: src/StoreHashIndex.h
===================================================================
RCS file: /squid/squid3/src/StoreHashIndex.h,v
retrieving revision 1.1
diff -u -u -r1.1 StoreHashIndex.h
--- src/StoreHashIndex.h 3 Jan 2005 16:08:25 -0000 1.1
+++ src/StoreHashIndex.h 28 Feb 2005 06:49:19 -0000
@@ -75,7 +75,7 @@

      virtual void maintain();

- virtual void updateSize(unsigned int, int);
+ virtual void updateSize(size_t, int);

      virtual StoreSearch *search(String const url, HttpRequest *);

-- 
Sean Chittenden
Received on Tue Mar 01 2005 - 14:43:26 MST

This archive was generated by hypermail pre-2.1.9 : Fri Apr 01 2005 - 12:00:04 MST