Remove the --disable-carp option, keeping the CARP code always compil…

…ed in

this configure option was a relic from the time when CARP was very intrusive,
requiring --enable-carp to be compiled and then chainging parent relations.
The current CARP implementaiton is very non-intrusive and by default enabled
(but not active unless used in squid.conf). There isn't really any good reason
to why one should use --disable-carp today.

configure.in

@@ -356,18 +356,6 @@ AC_ARG_ENABLE(xmalloc-statistics,
   fi
 ])
 
-use_carp=1
-AC_ARG_ENABLE(carp,
-[  --disable-carp          Disable CARP support],
-[ if test "$enableval" = "no" ; then
-    echo "CARP disabled"
-    use_carp=0
-  fi
-])      
-if test $use_carp = 1; then
-    AC_DEFINE(USE_CARP, 1, [Cache Array Routing Protocol])
-fi
-
 AC_ARG_ENABLE(async-io,
 [  --enable-async-io[=N_THREADS]
                           Shorthand for

squid3.dox

@@ -1018,7 +1018,6 @@ PREDEFINED             = \
 			USE_ARP_ACL \
 			USE_ASYNC_IO \
 			USE_CACHE_DIGESTS \
-			USE_CARP \
 			USE_CLASSFUL \
 			USE_DLMALLOC \
 			USE_DNSSERVERS \

src/cache_cf.cc

@@ -1733,15 +1733,13 @@ parse_peer(peer ** head)
 
         } else if (!strcasecmp(token, "no-netdb-exchange")) {
             p->options.no_netdb_exchange = 1;
-#if USE_CARP
 
         } else if (!strcasecmp(token, "carp")) {
             if (p->type != PEER_PARENT)
                 fatalf("parse_peer: non-parent carp peer %s/%d\n", p->host, p->http_port);
 
             p->options.carp = 1;
 
-#endif
 #if DELAY_POOLS
 
         } else if (!strcasecmp(token, "no-delay")) {

src/carp.cc

@@ -38,8 +38,6 @@
 #include "CacheManager.h"
 #include "Store.h"
 
-#if USE_CARP
-
 #define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
 
 static int n_carp_peers = 0;
@@ -227,5 +225,3 @@ carpCachemgr(StoreEntry * sentry)
                           sumfetches ? (double) p->stats.fetches / sumfetches : -1.0);
     }
 }
-
-#endif

src/enums.h

@@ -173,9 +173,7 @@ typedef enum {
     CD_PARENT_HIT,
     CD_SIBLING_HIT,
 #endif
-#if USE_CARP
     CARP,
-#endif
     ANY_OLD_PARENT,
     HIER_MAX
 } hier_code;

src/main.cc

@@ -626,10 +626,8 @@ serverConnectionsOpen(void)
     asnInit();
     ACL::Initialize();
     peerSelectInit();
-#if USE_CARP
 
     carpInit();
-#endif
 }
 
 void

src/peer_select.cc

@@ -63,9 +63,7 @@ const char *hier_strings[] =
         "CD_PARENT_HIT",
         "CD_SIBLING_HIT",
 #endif
-#if USE_CARP
         "CARP",
-#endif
         "ANY_PARENT",
         "INVALID CODE"
     };
@@ -505,12 +503,8 @@ peerGetSomeParent(ps_state * ps)
 
     if ((p = getDefaultParent(request))) {
         code = DEFAULT_PARENT;
-#if USE_CARP
-
     } else if ((p = carpSelectParent(request))) {
         code = CARP;
-#endif
-
     } else if ((p = getRoundRobinParent(request))) {
         code = ROUNDROBIN_PARENT;
     } else if ((p = getWeightedRoundRobinParent(request))) {

src/protos.h

@@ -728,11 +728,9 @@ SQUIDCEXTERN char *internalRemoteUri(const char *, u_short, const char *, const
 SQUIDCEXTERN const char *internalHostname(void);
 SQUIDCEXTERN int internalHostnameIs(const char *);
 
-#if USE_CARP
 SQUIDCEXTERN void carpInit(void);
 extern void carpRegisterWithCacheManager(CacheManager & manager);
 SQUIDCEXTERN peer *carpSelectParent(HttpRequest *);
-#endif
 
 
 #if USE_LEAKFINDER

src/structs.h

@@ -929,9 +929,7 @@ struct peer
         unsigned int no_delay:1;
 #endif
         unsigned int allow_miss:1;
-#if USE_CARP
         unsigned int carp:1;
-#endif
         unsigned int originserver:1;
     } options;
 
@@ -966,15 +964,13 @@ struct peer
     int rr_lastcount;
     peer *next;
     int test_fd;
-#if USE_CARP
 
     struct
     {
         unsigned int hash;
         double load_multiplier;
         double load_factor;	/* normalized weight value */
     } carp;
-#endif
 
     char *login;		/* Proxy authorization */
     time_t connect_timeout;