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/10/11 18:31:06 UTC
svn commit: r1181877 - in /trafficserver/traffic/trunk: iocore/cluster/
iocore/eventsystem/ iocore/hostdb/ lib/ts/ proxy/hdrs/ proxy/logging/
Author: zwoop
Date: Tue Oct 11 16:31:05 2011
New Revision: 1181877
URL: http://svn.apache.org/viewvc?rev=1181877&view=rev
Log:
TS-567 Cleanup around PURIFY
Modified:
trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/iocore/cluster/P_ClusterInline.h
trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h
trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h
trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h
trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
trafficserver/traffic/trunk/lib/ts/ink_config.h.in
trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterCache.cc Tue Oct 11 16:31:05 2011
@@ -433,7 +433,7 @@ CacheContinuation::do_op(Continuation *
// Determine the type of the "Over The Wire" (OTW) message header and
// initialize it.
//
-#ifdef PURIFY
+#if TS_HAS_PURIFY
if (data)
memset(data, 0, op_to_sizeof_fixedlen_msg(opcode));
#endif
@@ -464,7 +464,7 @@ CacheContinuation::do_op(Continuation *
if (!data) {
data_len = op_to_sizeof_fixedlen_msg(opcode);
data = (char *) ALLOCA_DOUBLE(data_len);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset(data, 0, data_len);
#endif
}
@@ -2511,7 +2511,7 @@ CacheContinuation::do_remote_lookup(Cont
ClusterMachine *past_probes[CONFIGURATION_HISTORY_PROBE_DEPTH] = { 0 };
int mlen = op_to_sizeof_fixedlen_msg(CACHE_LOOKUP_OP) + ((hostname && hostname_len) ? hostname_len : 0);
CacheLookupMsg *msg = (CacheLookupMsg *) ALLOCA_DOUBLE(mlen);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset((char *) msg, 0, mlen);
#endif
msg->init();
@@ -2691,7 +2691,7 @@ CacheContinuation::replyLookupEvent(int
if (vers == CacheOpReplyMsg::CACHE_OP_REPLY_MESSAGE_VERSION) {
CacheOpReplyMsg *msg;
int flen = CacheOpReplyMsg::sizeof_fixedlen_msg();
-#ifdef PURIFY
+#if TS_HAS_PURIFY
msg = (CacheOpReplyMsg *)ats_malloc(flen);
#else
msg = (CacheOpReplyMsg *) ALLOCA_DOUBLE(flen);
@@ -2707,7 +2707,7 @@ CacheContinuation::replyLookupEvent(int
log_cache_op_sndmsg(seq_number, event, "cache_result");
#endif
clusterProcessor.invoke_remote(from, CACHE_OP_RESULT_CLUSTER_FUNCTION, msg, len);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
ats_free(msg);
#endif
}
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc Tue Oct 11 16:31:05 2011
@@ -1852,7 +1852,7 @@ ClusterHandler::add_small_controlmsg_des
c->free_data();
c->mutex = NULL;
p += c->len;
-#ifdef PURIFY
+#if TS_HAS_PURIFY
char *endp = p;
#endif
ink_hrtime now = ink_get_hrtime();
@@ -1860,7 +1860,7 @@ ClusterHandler::add_small_controlmsg_des
LOG_EVENT_TIME(c->submit_time, cluster_send_time_dist, cluster_send_events);
c->freeall();
p = (char *) DOUBLE_ALIGN(p);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
if (endp < p)
memset(endp, 0, (p - endp));
#endif
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Tue Oct 11 16:31:05 2011
@@ -85,7 +85,7 @@ ClusterControl::real_alloc_data(int read
} else {
data = ((char *) real_data) + DATA_HDR;
}
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset((char *) real_data, 0, BUFFER_SIZE_FOR_INDEX(size_index));
#endif
} else {
@@ -101,7 +101,7 @@ ClusterControl::real_alloc_data(int read
data = (char *) DOUBLE_ALIGN(real_data) + DATA_HDR;
}
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_ALLOC_DATA_NEWS_STAT);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset((char *) real_data, 0, size);
#endif
}
Modified: trafficserver/traffic/trunk/iocore/cluster/P_ClusterInline.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/P_ClusterInline.h?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/P_ClusterInline.h (original)
+++ trafficserver/traffic/trunk/iocore/cluster/P_ClusterInline.h Tue Oct 11 16:31:05 2011
@@ -100,7 +100,7 @@ Cluster_read(ClusterMachine * owner_mach
// Perform data Marshal operation
msg = (char *) ALLOCA_DOUBLE(flen + len);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset((char *) msg, 0, flen);
#endif
data = msg + flen;
@@ -136,7 +136,7 @@ Cluster_read(ClusterMachine * owner_mach
goto err_exit;
msg = (char *) ALLOCA_DOUBLE(flen + len);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset((char *) msg, 0, flen);
#endif
data = msg + flen;
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_IOBuffer.h Tue Oct 11 16:31:05 2011
@@ -54,7 +54,7 @@ inkcoreapi extern int64_t max_iobuffer_s
extern int64_t default_small_iobuffer_size;
extern int64_t default_large_iobuffer_size; // matched to size of OS buffers
-#if !defined(PURIFY)
+#if !TS_HAS_PURIFY
// Define this macro to enable buffer usage tracking.
#define TRACK_BUFFER_USER
#endif
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_Lock.h Tue Oct 11 16:31:05 2011
@@ -732,7 +732,7 @@ MutexTryLock _l(__FILE__,__LINE__,(char*
# define MUTEX_TRY_LOCK_SPIN(_l,_m,_t,_sc) \
MutexTryLock _l(__FILE__,__LINE__,(char*)NULL,_m,_t,_sc)
-# ifdef PURIFY
+# if TS_HAS_PURIFY
/**
Attempts to acquire the lock to the ProxyMutex.
@@ -750,10 +750,10 @@ MutexTryLock _l(__FILE__,__LINE__,(char*
*/
# define MUTEX_TRY_LOCK_FOR(_l,_m,_t,_c) \
MutexTryLock _l(__FILE__,__LINE__,(char *)NULL,_m,_t)
-# else //PURIFY
+# else // !TS_HAS_PURIFY
# define MUTEX_TRY_LOCK_FOR(_l,_m,_t,_c) \
MutexTryLock _l(__FILE__,__LINE__,HANDLER_NAME(_c),_m,_t)
-# endif //PURIFY
+# endif // TS_HAS_PURIFY
# else //DEBUG
# define MUTEX_TRY_LOCK(_l,_m,_t) MutexTryLock _l(_m,_t)
# define MUTEX_TRY_LOCK_SPIN(_l,_m,_t,_sc) MutexTryLock _l(_m,_t,_sc)
@@ -779,7 +779,7 @@ MutexTryLock _l(__FILE__,__LINE__,HANDLE
#ifdef DEBUG
# define MUTEX_TAKE_TRY_LOCK(_m,_t) \
Mutex_trylock(__FILE__,__LINE__,(char*)NULL,_m,_t)
-# ifdef PURIFY
+# if TS_HAS_PURIFY
# define MUTEX_TAKE_TRY_LOCK_FOR(_m,_t,_c) \
Mutex_trylock(__FILE__,__LINE__,(char *)NULL,_m,_t)
# define MUTEX_TAKE_TRY_LOCK_FOR_SPIN(_m,_t,_c,_sc) \
@@ -802,13 +802,13 @@ Mutex_trylock_spin(_m,_t,_sc)
Mutex_lock(__FILE__,__LINE__,(char*)NULL,_m,_t)
# define MUTEX_SET_AND_TAKE_LOCK(_s,_m,_t)\
_s.set_and_take(__FILE__,__LINE__,(char*)NULL,_m,_t)
-# ifdef PURIFY
+# if TS_HAS_PURIFY
# define MUTEX_TAKE_LOCK_FOR(_m,_t,_c) \
Mutex_lock(__FILE__,__LINE__,(char *)NULL,_m,_t)
# else
# define MUTEX_TAKE_LOCK_FOR(_m,_t,_c) \
Mutex_lock(__FILE__,__LINE__,HANDLER_NAME(_c),_m,_t)
-# endif //PURIFY
+# endif // TS_HAS_PURIFY
#else
# define MUTEX_TAKE_LOCK(_m,_t) Mutex_lock(_m,_t)
# define MUTEX_SET_AND_TAKE_LOCK(_s,_m,_t)_s.set_and_take(_m,_t)
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h Tue Oct 11 16:31:05 2011
@@ -81,7 +81,7 @@ thread_freeup(ClassAllocator<C> &a, Prox
ink_assert(!l.allocated);
}
-#if !defined (PURIFY) && !defined(_IOCORE_WIN32) && defined(TS_USE_FREELIST)
+#if !TS_HAS_PURIFY && !defined(_IOCORE_WIN32) && defined(TS_USE_FREELIST)
#define THREAD_ALLOC(_a, _t) thread_alloc(::_a, _t->_a)
#define THREAD_ALLOC_INIT(_a, _t) thread_alloc_init(::_a, _t->_a)
#define THREAD_FREE_TO(_p, _a, _t, _m) do { \
Modified: trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h Tue Oct 11 16:31:05 2011
@@ -329,7 +329,7 @@ HostDBInfo()
, reverse_dns(0)
, md5_low_low(0)
, md5_low(0), md5_high(0) {
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset(&app, 0, sizeof(app));
#else
app.allotment.application1 = 0;
Modified: trafficserver/traffic/trunk/lib/ts/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_config.h.in?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_config.h.in Tue Oct 11 16:31:05 2011
@@ -162,10 +162,6 @@
# define HTTP_CACHE 1
#endif
-#if TS_HAS_PURIFY
-# define PURIFY 1
-#endif
-
/* Defaults for user / group */
#define TS_PKGSYSUSER "@pkgsysuser@"
#define TS_PKGSYSGROUP "@pkgsysgroup@"
Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc Tue Oct 11 16:31:05 2011
@@ -172,7 +172,7 @@ new_HdrStrHeap(int requested_size)
ink_assert(sh->m_free_size > 0);
-#ifdef PURIFY
+#if TS_HAS_PURIFY
memset(sh->m_free_start, '#', sh->m_free_size);
#endif
Modified: trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc?rev=1181877&r1=1181876&r2=1181877&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogAccess.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogAccess.cc Tue Oct 11 16:31:05 2011
@@ -721,10 +721,8 @@ LogAccess::marshal_record(char *record,
ink_debug_assert(num_chars <= max_chars);
memcpy(buf, out_buf, num_chars);
-#ifdef PURIFY
- for (unsigned int i = num_chars + 1; i < max_chars; ++i) {
- buf[i] = '$';
- }
+#if TS_HAS_PURIFY
+ memset(buf + num_chars + 1, '$', max_chars - num_chars - 1);
#endif
return max_chars;