svn commit: r984186 - in /trafficserver/traffic/trunk/iocore/cache: Cache.cc I_CacheDefs.h P_CacheInternal.h

[jplevyak]

Author: jplevyak
Date: Tue Aug 10 19:45:33 2010
New Revision: 984186

URL: http://svn.apache.org/viewvc?rev=984186&view=rev
Log:
TS-76: CACHE_FRAG_TYPE is now not a power of 2

Modified:
    trafficserver/traffic/trunk/iocore/cache/Cache.cc
    trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h
    trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h

Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=984186&r1=984185&r2=984186&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Tue Aug 10 19:45:33 2010
@@ -77,14 +77,16 @@ int cache_config_enable_checksum = 0;
 int cache_config_alt_rewrite_max_size = 4096;
 int cache_config_read_while_writer = 0;
 char cache_system_config_directory[PATH_NAME_MAX + 1];
+
 // Globals
+
 RecRawStatBlock *cache_rsb = NULL;
 Cache *theStreamCache = 0;
 Cache *theCache = 0;
 CacheDisk **gdisks = NULL;
 int gndisks = 0;
 static volatile int initialize_disk = 0;
-Cache *caches[1 << NumCacheFragTypes] = { 0 };
+Cache *caches[NUM_CACHE_FRAG_TYPES] = { 0 };
 CacheSync *cacheDirSync = 0;
 Store theCacheStore;
 volatile int CacheProcessor::initialized = CACHE_INITIALIZING;
@@ -699,8 +701,8 @@ CacheProcessor::cacheInitialized()
       Debug("cache_init", "CacheProcessor::cacheInitialized - failed to 
initialize the cache for http: cache disabled");
       Warning("failed to initialize the cache for http: cache disabled\n");
     } else {
-      caches_ready = caches_ready | CACHE_FRAG_TYPE_HTTP;
-      caches_ready = caches_ready | CACHE_FRAG_TYPE_NONE;
+      caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_HTTP);
+      caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_NONE);
       caches[CACHE_FRAG_TYPE_HTTP] = theCache;
       caches[CACHE_FRAG_TYPE_NONE] = theCache;
     }
@@ -711,7 +713,7 @@ CacheProcessor::cacheInitialized()
             "CacheProcessor::cacheInitialized - failed to initialize the cache 
for streaming: cache disabled");
       Warning("failed to initialize the cache for streaming: cache 
disabled\n");
     } else {
-      caches_ready = caches_ready | CACHE_FRAG_TYPE_RTSP;
+      caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_RTSP);
       caches[CACHE_FRAG_TYPE_RTSP] = theStreamCache;
     }
   }
@@ -1652,15 +1654,15 @@ AIO_Callback_handler::handle_disk_failur
 
   if (theCache && !theCache->hosttable->gen_host_rec.part_hash_table) {
     unsigned int caches_ready = 0;
-    caches_ready = caches_ready | CACHE_FRAG_TYPE_HTTP;
-    caches_ready = caches_ready | CACHE_FRAG_TYPE_NONE;
+    caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_HTTP);
+    caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_NONE);
     caches_ready = ~caches_ready;
     CacheProcessor::cache_ready &= caches_ready;
     Warning("all partitions for http cache are corrupt, http cache disabled");
   }
   if (theStreamCache && 
!theStreamCache->hosttable->gen_host_rec.part_hash_table) {
     unsigned int caches_ready = 0;
-    caches_ready = caches_ready | CACHE_FRAG_TYPE_RTSP;
+    caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_RTSP);
     caches_ready = ~caches_ready;
     CacheProcessor::cache_ready &= caches_ready;
     Warning("all partitions for mixt cache are corrupt, mixt cache disabled");

Modified: trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h?rev=984186&r1=984185&r2=984186&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/I_CacheDefs.h Tue Aug 10 19:45:33 
2010
@@ -110,12 +110,12 @@ enum CacheDataType
   CACHE_DATA_RAM_CACHE_HIT_FLAG
 };
 
-#define NumCacheFragTypes 5
 enum CacheFragType
 {
-  CACHE_FRAG_TYPE_NONE = 1 << 0,
-  CACHE_FRAG_TYPE_HTTP = 1 << 1,
-  CACHE_FRAG_TYPE_RTSP = 1 << 2
+  CACHE_FRAG_TYPE_NONE,
+  CACHE_FRAG_TYPE_HTTP,
+  CACHE_FRAG_TYPE_RTSP,
+  NUM_CACHE_FRAG_TYPES
 };
 
 #define CacheKey INK_MD5

Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h?rev=984186&r1=984185&r2=984186&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h Tue Aug 10 
19:45:33 2010
@@ -992,7 +992,7 @@ struct Cache
 
 extern Cache *theCache;
 extern Cache *theStreamCache;
-inkcoreapi extern Cache *caches[1 << NumCacheFragTypes];
+inkcoreapi extern Cache *caches[NUM_CACHE_FRAG_TYPES];
 extern int cache_config_vary_on_user_agent;