You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/03/04 03:42:29 UTC
svn commit: r1076921 - /trafficserver/traffic/trunk/iocore/cache/Cache.cc
Author: zwoop
Date: Fri Mar 4 02:42:29 2011
New Revision: 1076921
URL: http://svn.apache.org/viewvc?rev=1076921&view=rev
Log:
TS-682 Segfault when partition.config is used.
Modified:
trafficserver/traffic/trunk/iocore/cache/Cache.cc
Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=1076921&r1=1076920&r2=1076921&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Fri Mar 4 02:42:29 2011
@@ -166,14 +166,14 @@ int64_t
cache_bytes_used(int partition)
{
uint64_t used = 0;
- int start, end;
+ int start = 0; // These defaults are for partition 0 or partition 1 (with partition.config)
+ int end = 1;
if (-1 == partition) {
- start = 0;
end = gnpart;
- } else {
- start = partition;
- end = partition + 1;
+ } else if (partition > 1) { // Special case when partition.config is used
+ start = partition - 1;
+ end = partition;
}
for (int i = start; i < end; i++) {