svn commit: r925018 - in /incubator/trafficserver/traffic/trunk: iocore/cache/CachePart.cc proxy/Show.h

[jp...@apache.org]

Author: jplevyak
Date: Thu Mar 18 22:05:36 2010
New Revision: 925018

URL: http://svn.apache.org/viewvc?rev=925018&view=rev
Log:
TS-252: fix 2 issues with the cache inspector. One is a fix for StatPages and the other is a fix in the Cache scan routines. However, there is still in issue in URL.cc (TS-253).

Modified:
    incubator/trafficserver/traffic/trunk/iocore/cache/CachePart.cc
    incubator/trafficserver/traffic/trunk/proxy/Show.h

Modified: incubator/trafficserver/traffic/trunk/iocore/cache/CachePart.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/iocore/cache/CachePart.cc?rev=925018&r1=925017&r2=925018&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/iocore/cache/CachePart.cc (original)
+++ incubator/trafficserver/traffic/trunk/iocore/cache/CachePart.cc Thu Mar 18 22:05:36 2010
@@ -43,7 +43,7 @@ Cache::scan(Continuation * cont, char *h
   c->hostname = hostname;
   c->host_len = host_len;
   c->base_stat = cache_scan_active_stat;
-  c->buf = new_xmalloc_IOBufferData(xmalloc(SCAN_BUF_SIZE), SCAN_BUF_SIZE);
+  c->buf = new_IOBufferData(BUFFER_SIZE_FOR_XMALLOC(SCAN_BUF_SIZE), MEMALIGNED);
   c->scan_msec_delay = (512000 / KB_per_second);
   c->offset = 0;
   SET_CONTINUATION_HANDLER(c, &CacheVC::scanPart);
@@ -175,8 +175,7 @@ CacheVC::scanObject(int event, Event * e
       if (!vector.get(i)->valid())
         continue;
       if (!hostinfo_copied) {
-        memccpy(hname, vector.get(i)->request_get()->url_get()->host_get(&hlen)
-                , 0, 500);
+        memccpy(hname, vector.get(i)->request_get()->url_get()->host_get(&hlen), 0, 500);
         Debug("cache_scan", "hostname = '%s', hostlen = %d", hname, hlen);
         hostinfo_copied = 1;
       }

Modified: incubator/trafficserver/traffic/trunk/proxy/Show.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Show.h?rev=925018&r1=925017&r2=925018&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Show.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Show.h Thu Mar 18 22:05:36 2010
@@ -79,6 +79,7 @@ struct ShowCont:Continuation
     if (!action.cancelled) {
       StatPageData data(start, buf - start);
       action.continuation->handleEvent(STAT_PAGE_SUCCESS, &data);
+      start = 0;
     } else {
       xfree(start);
       start = NULL;