Author: zwoop
Date: Mon Jan 31 20:17:44 2011
New Revision: 1065744
URL: http://svn.apache.org/viewvc?rev=1065744&view=rev
Log:
TS-660 Cache scan can not be canceled.
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/iocore/cache/CachePart.cc
trafficserver/traffic/trunk/iocore/cache/I_Cache.h
trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h
trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1065744&r1=1065743&r2=1065744&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Mon Jan 31 20:17:44 2011
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 2.1.6
+ *) Cache scan can not be canceled [TS-660].
+
*) Changed the defaults to deal with read contention on the cache, this
dramatically improves the performance on cache misses [TS-505, TS-506].
Modified: trafficserver/traffic/trunk/iocore/cache/CachePart.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CachePart.cc?rev=1065744&r1=1065743&r2=1065744&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CachePart.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CachePart.cc Mon Jan 31 20:17:44
2011
@@ -49,7 +49,7 @@ Cache::scan(Continuation * cont, char *h
SET_CONTINUATION_HANDLER(c, &CacheVC::scanPart);
eventProcessor.schedule_in(c, HRTIME_MSECONDS(c->scan_msec_delay));
cont->handleEvent(CACHE_EVENT_SCAN, c);
- return ACTION_RESULT_DONE;
+ return &c->_action;
}
int
Modified: trafficserver/traffic/trunk/iocore/cache/I_Cache.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/I_Cache.h?rev=1065744&r1=1065743&r2=1065744&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/I_Cache.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/I_Cache.h Mon Jan 31 20:17:44 2011
@@ -177,7 +177,6 @@ struct CacheVConnection:public VConnecti
virtual void get_http_info(CacheHTTPInfo **info) = 0;
#endif
- virtual Action *action() = 0;
virtual bool is_ram_cache_hit() = 0;
virtual bool set_disk_io_priority(int priority) = 0;
virtual int get_disk_io_priority() = 0;
Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h?rev=1065744&r1=1065743&r2=1065744&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h Mon Jan 31
20:17:44 2011
@@ -242,10 +242,7 @@ struct CacheVC: public CacheVConnection
void reenable_re(VIO *avio);
bool get_data(int i, void *data);
bool set_data(int i, void *data);
- Action *action()
- {
- return &_action;
- }
+
bool is_ram_cache_hit()
{
ink_assert(vio.op == VIO::READ);
Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h?rev=1065744&r1=1065743&r2=1065744&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterCache.h Mon Jan 31
20:17:44 2011
@@ -392,10 +392,6 @@ struct ClusterVConnectionBase: public Ca
Event *inactivity_timeout;
Event *active_timeout;
- virtual Action *action()
- {
- return &action_;
- }
virtual void reenable(VIO *);
virtual void reenable_re(VIO *);
};
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h?rev=1065744&r1=1065743&r2=1065744&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_VConnection.h Mon Jan 31
20:17:44 2011
@@ -360,11 +360,6 @@ public:
return false;
}
- virtual Action *action()
- {
- return NULL;
- }
-
public:
/**
Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h?rev=1065744&r1=1065743&r2=1065744&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNetVConnection.h Mon Jan 31
20:17:44 2011
@@ -186,11 +186,6 @@ public:
void writeReschedule(NetHandler *nh);
void netActivity(EThread *lthread);
- Action *action()
- {
- return &action_;
- }
-
Action action_;
volatile int closed;
NetState read;
