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 2010/10/25 00:19:03 UTC
svn commit: r1026907 - in /trafficserver/traffic/trunk: ./ iocore/cache/
iocore/eventsystem/ iocore/hostdb/ iocore/net/ libinktomi++/ proxy/
proxy/congest/ proxy/hdrs/ proxy/http2/ proxy/mgmt2/api2/remote/
Author: zwoop
Date: Sun Oct 24 22:19:02 2010
New Revision: 1026907
URL: http://svn.apache.org/viewvc?rev=1026907&view=rev
Log:
TS-410 Make regression tests compile time optional.
It's now possible, via --disable-tests, to compile ATS without
the regression tests. I've also cleaned up the checks around
diagnostics. Both these features are enabled by default, so no
change in our normal behavior with this patch.
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/cache/Cache.cc
trafficserver/traffic/trunk/iocore/cache/CacheTest.cc
trafficserver/traffic/trunk/iocore/cache/Makefile.am
trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h
trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h
trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
trafficserver/traffic/trunk/iocore/net/Makefile.am
trafficserver/traffic/trunk/iocore/net/P_Net.h
trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
trafficserver/traffic/trunk/iocore/net/UnixConnection.cc
trafficserver/traffic/trunk/iocore/net/UnixNet.cc
trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
trafficserver/traffic/trunk/libinktomi++/Diags.h
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/PluginVC.cc
trafficserver/traffic/trunk/proxy/SimpleHttp.cc
trafficserver/traffic/trunk/proxy/Transform.cc
trafficserver/traffic/trunk/proxy/Transform.h
trafficserver/traffic/trunk/proxy/congest/Congestion.cc
trafficserver/traffic/trunk/proxy/congest/Makefile.am
trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
trafficserver/traffic/trunk/proxy/hdrs/URL.h
trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
trafficserver/traffic/trunk/proxy/http2/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Sun Oct 24 22:19:02 2010
@@ -161,6 +161,23 @@ AC_MSG_RESULT([$enable_diags])
AC_SUBST(use_diags)
#
+# Build regression tests?
+#
+
+has_tests=0
+AC_MSG_CHECKING([whether to enable regression tests])
+AC_ARG_ENABLE([tests],
+ [AS_HELP_STRING([--disable-tests],[turn off regression tests])],
+ [],
+ [enable_tests="yes"
+ has_tests=1
+ ]
+)
+AC_MSG_RESULT([$enable_tests])
+AC_SUBST(has_tests)
+AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" = "xyes"])
+
+#
# Purify
#
has_purify=0
Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Sun Oct 24 22:19:02 2010
@@ -110,6 +110,21 @@ ClassAllocator<EvacuationKey> evacuation
int CacheVC::size_to_init = -1;
CacheKey zero_key(0, 0);
+void verify_cache_api() {
+ ink_assert((int)INK_EVENT_CACHE_OPEN_READ == (int)CACHE_EVENT_OPEN_READ);
+ ink_assert((int)INK_EVENT_CACHE_OPEN_READ_FAILED == (int)CACHE_EVENT_OPEN_READ_FAILED);
+ ink_assert((int)INK_EVENT_CACHE_OPEN_WRITE == (int)CACHE_EVENT_OPEN_WRITE);
+ ink_assert((int)INK_EVENT_CACHE_OPEN_WRITE_FAILED == (int)CACHE_EVENT_OPEN_WRITE_FAILED);
+ ink_assert((int)INK_EVENT_CACHE_REMOVE == (int)CACHE_EVENT_REMOVE);
+ ink_assert((int)INK_EVENT_CACHE_REMOVE_FAILED == (int)CACHE_EVENT_REMOVE_FAILED);
+ ink_assert((int)INK_EVENT_CACHE_SCAN == (int)CACHE_EVENT_SCAN);
+ ink_assert((int)INK_EVENT_CACHE_SCAN_FAILED == (int)CACHE_EVENT_SCAN_FAILED);
+ ink_assert((int)INK_EVENT_CACHE_SCAN_OBJECT == (int)CACHE_EVENT_SCAN_OBJECT);
+ ink_assert((int)INK_EVENT_CACHE_SCAN_OPERATION_BLOCKED == (int)CACHE_EVENT_SCAN_OPERATION_BLOCKED);
+ ink_assert((int)INK_EVENT_CACHE_SCAN_OPERATION_FAILED == (int)CACHE_EVENT_SCAN_OPERATION_FAILED);
+ ink_assert((int)INK_EVENT_CACHE_SCAN_DONE == (int)CACHE_EVENT_SCAN_DONE);
+}
+
struct PartInitInfo
{
off_t recover_pos;
Modified: trafficserver/traffic/trunk/iocore/cache/CacheTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheTest.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheTest.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheTest.cc Sun Oct 24 22:19:02 2010
@@ -26,22 +26,6 @@
#include "P_CacheTest.h"
#include "api/ts/ts.h"
-
-void verify_cache_api() {
- ink_assert((int)INK_EVENT_CACHE_OPEN_READ == (int)CACHE_EVENT_OPEN_READ);
- ink_assert((int)INK_EVENT_CACHE_OPEN_READ_FAILED == (int)CACHE_EVENT_OPEN_READ_FAILED);
- ink_assert((int)INK_EVENT_CACHE_OPEN_WRITE == (int)CACHE_EVENT_OPEN_WRITE);
- ink_assert((int)INK_EVENT_CACHE_OPEN_WRITE_FAILED == (int)CACHE_EVENT_OPEN_WRITE_FAILED);
- ink_assert((int)INK_EVENT_CACHE_REMOVE == (int)CACHE_EVENT_REMOVE);
- ink_assert((int)INK_EVENT_CACHE_REMOVE_FAILED == (int)CACHE_EVENT_REMOVE_FAILED);
- ink_assert((int)INK_EVENT_CACHE_SCAN == (int)CACHE_EVENT_SCAN);
- ink_assert((int)INK_EVENT_CACHE_SCAN_FAILED == (int)CACHE_EVENT_SCAN_FAILED);
- ink_assert((int)INK_EVENT_CACHE_SCAN_OBJECT == (int)CACHE_EVENT_SCAN_OBJECT);
- ink_assert((int)INK_EVENT_CACHE_SCAN_OPERATION_BLOCKED == (int)CACHE_EVENT_SCAN_OPERATION_BLOCKED);
- ink_assert((int)INK_EVENT_CACHE_SCAN_OPERATION_FAILED == (int)CACHE_EVENT_SCAN_OPERATION_FAILED);
- ink_assert((int)INK_EVENT_CACHE_SCAN_DONE == (int)CACHE_EVENT_SCAN_DONE);
-}
-
CacheTestSM::CacheTestSM(RegressionTest *t) :
RegressionSM(t),
timeout(0),
Modified: trafficserver/traffic/trunk/iocore/cache/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Makefile.am?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/cache/Makefile.am Sun Oct 24 22:19:02 2010
@@ -36,7 +36,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/proxy/mgmt2/utils \
-DSYSCONFDIR=\"$(sysconfdir)\"
-ADD_SRC = CacheTest.cc P_CacheTest.h NewCacheVC.cc NewCacheVC.h
+ADD_SRC = NewCacheVC.cc NewCacheVC.h
+
+if BUILD_TESTS
+ ADD_SRC += CacheTest.cc P_CacheTest.h
+endif
+
endif
DEFS += @IOCORE_MODULARIZED_DEFS@
@@ -71,5 +76,3 @@ libinkcache_a_SOURCES = \
RamCacheCLFUS.cc \
Store.cc \
Inline.cc $(ADD_SRC)
-
-
Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheTest.h Sun Oct 24 22:19:02 2010
@@ -126,6 +126,4 @@ struct CacheTestSM : public RegressionSM
RegressionSM *clone() { return new CacheTestSM__##_sm(*this); } \
} _sm(_t);
-void verify_cache_api();
-
#endif /* __P_CACHE_TEST_H__ */
Modified: trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/I_ProxyAllocator.h Sun Oct 24 22:19:02 2010
@@ -35,7 +35,7 @@
class EThread;
-#define MAX_ON_THREAD_FREELIST 200
+#define MAX_ON_THREAD_FREELIST 512
struct ProxyAllocator
{
Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Sun Oct 24 22:19:02 2010
@@ -2305,7 +2305,7 @@ HostDBTestReverse():Continuation(new_Pro
};
-#ifdef NON_MODULAR
+#if TS_HAS_TESTS
void
run_HostDBTest()
{
@@ -2320,7 +2320,6 @@ run_HostDBTest()
RecRawStatBlock *hostdb_rsb;
-
void
ink_hostdb_init(ModuleVersion v)
{
Modified: trafficserver/traffic/trunk/iocore/net/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Makefile.am?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/net/Makefile.am Sun Oct 24 22:19:02 2010
@@ -50,7 +50,6 @@ libinknet_a_SOURCES = \
Net.cc \
NetConfig.cc \
NetVConnection.cc \
- NetVCTest.cc \
P_CompletionUtil.h \
P_Connection.h \
P_InkBulkIO.h \
@@ -58,7 +57,6 @@ libinknet_a_SOURCES = \
P_NetAccept.h \
P_Net.h \
P_NetVConnection.h \
- P_NetVCTest.h \
P_Socks.h \
P_SSLCertLookup.h \
P_SSLConfig.h \
@@ -93,6 +91,12 @@ libinknet_a_SOURCES = \
UnixUDPNet.cc \
Inline.cc
+if BUILD_TESTS
+ libinknet_a_SOURCES += NetVCTest.cc \
+ P_NetVCTest.h
+endif
+
+
# TODO: These two should probably be moved to somewhere else (libintkomi++?)
if BUILD_DETAILED_LOG
libinknet_a_SOURCES += \
Modified: trafficserver/traffic/trunk/iocore/net/P_Net.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_Net.h?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_Net.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_Net.h Sun Oct 24 22:19:02 2010
@@ -94,12 +94,6 @@ do { \
#define NET_DECREMENT_THREAD_DYN_STAT(_s, _t) \
RecIncrRawStatSum(net_rsb, _t, (int) _s, -1);
-#ifndef DEBUG
-#define NetDebug if (0) dummy_debug
-#else
-#define NetDebug Debug
-#endif
-
#include "inktomi++.h"
#include "P_EventSystem.h"
#include "I_Net.h"
Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Sun Oct 24 22:19:02 2010
@@ -589,7 +589,7 @@ TS_INLINE int EventIO::start(EventLoop l
#if TS_USE_PORT
events = e;
int retval = port_associate(event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
- NetDebug("iocore_eventio", "[EventIO::start] e(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, events, retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
+ Debug("iocore_eventio", "[EventIO::start] e(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, events, retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
return retval;
#endif
}
@@ -659,7 +659,7 @@ TS_INLINE int EventIO::modify(int e) {
if (n && ne && event_loop) {
events = ne;
int retval = port_associate(event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
- NetDebug("iocore_eventio", "[EventIO::modify] e(%d), ne(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, ne, events, retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
+ Debug("iocore_eventio", "[EventIO::modify] e(%d), ne(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, ne, events, retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
return retval;
}
return 0;
@@ -695,7 +695,7 @@ TS_INLINE int EventIO::refresh(int e) {
if (n && ne && event_loop) {
events = ne;
int retval = port_associate(event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
- NetDebug("iocore_eventio", "[EventIO::refresh] e(%d), ne(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, ne, events, retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
+ Debug("iocore_eventio", "[EventIO::refresh] e(%d), ne(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, ne, events, retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
return retval;
}
}
@@ -717,7 +717,7 @@ TS_INLINE int EventIO::stop() {
#endif
#if TS_USE_PORT
int retval = port_dissociate(event_loop->port_fd, PORT_SOURCE_FD, fd);
- NetDebug("iocore_eventio", "[EventIO::stop] %d[%s]=port_dissociate(%d,%d,%d)", retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd);
+ Debug("iocore_eventio", "[EventIO::stop] %d[%s]=port_dissociate(%d,%d,%d)", retval, retval<0? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd);
return retval;
#endif
event_loop = 0;
Modified: trafficserver/traffic/trunk/iocore/net/UnixConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixConnection.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixConnection.cc Sun Oct 24 22:19:02 2010
@@ -255,7 +255,7 @@ Connection::open(NetVCOptions const& opt
int rbufsz = ROUNDUP(opt.socket_recv_bufsize, 1024);
while (rbufsz && !socketManager.set_rcvbuf_size(fd, rbufsz))
rbufsz -= 1024;
- NetDebug("socket", "::open: recv_bufsize = %d of %d\n", rbufsz, opt.socket_recv_bufsize);
+ Debug("socket", "::open: recv_bufsize = %d of %d\n", rbufsz, opt.socket_recv_bufsize);
}
}
if (opt.socket_send_bufsize > 0) {
@@ -264,18 +264,18 @@ Connection::open(NetVCOptions const& opt
int sbufsz = ROUNDUP(opt.socket_send_bufsize, 1024);
while (sbufsz && !socketManager.set_sndbuf_size(fd, sbufsz))
sbufsz -= 1024;
- NetDebug("socket", "::open: send_bufsize = %d of %d\n", sbufsz, opt.socket_send_bufsize);
+ Debug("socket", "::open: send_bufsize = %d of %d\n", sbufsz, opt.socket_send_bufsize);
}
}
if (SOCK_STREAM == sock_type) {
if (opt.sockopt_flags & NetVCOptions::SOCK_OPT_NO_DELAY) {
safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int));
- NetDebug("socket", "::open: setsockopt() TCP_NODELAY on socket");
+ Debug("socket", "::open: setsockopt() TCP_NODELAY on socket");
}
if (opt.sockopt_flags & NetVCOptions::SOCK_OPT_KEEP_ALIVE) {
safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int));
- NetDebug("socket", "::open: setsockopt() SO_KEEPALIVE on socket");
+ Debug("socket", "::open: setsockopt() SO_KEEPALIVE on socket");
}
}
@@ -286,13 +286,13 @@ Connection::open(NetVCOptions const& opt
if (-1 == safe_setsockopt(fd, SOL_IP, TS_IP_TRANSPARENT,
reinterpret_cast<char*>(&value), sizeof(value)
)) {
- NetDebug("socket", "%s - fail %d:%s", DEBUG_TEXT, errno, strerror(errno));
+ Debug("socket", "%s - fail %d:%s", DEBUG_TEXT, errno, strerror(errno));
return -errno;
} else {
- NetDebug("socket", "%s set", DEBUG_TEXT);
+ Debug("socket", "%s set", DEBUG_TEXT);
}
#else
- NetDebug("socket", "%s - requested but TPROXY not configured", DEBUG_TEXT);
+ Debug("socket", "%s - requested but TPROXY not configured", DEBUG_TEXT);
#endif
}
Modified: trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNet.cc Sun Oct 24 22:19:02 2010
@@ -101,7 +101,7 @@ PollCont::pollEvent(int event, Event *e)
if (likely
(!net_handler->read_ready_list.empty() || !net_handler->read_ready_list.empty() ||
!net_handler->read_enable_list.empty() || !net_handler->write_enable_list.empty())) {
- NetDebug("iocore_net_poll", "rrq: %d, wrq: %d, rel: %d, wel: %d", net_handler->read_ready_list.empty(),
+ Debug("iocore_net_poll", "rrq: %d, wrq: %d, rel: %d, wel: %d", net_handler->read_ready_list.empty(),
net_handler->write_ready_list.empty(), net_handler->read_enable_list.empty(),
net_handler->write_enable_list.empty());
poll_timeout = 0; //poll immediately returns -- we have triggered stuff to process right now
@@ -116,11 +116,11 @@ PollCont::pollEvent(int event, Event *e)
fd_reify(eio);
eio->backend_poll(eio, pt);
pollDescriptor->result = eio->pendingcnt[0];
- NetDebug("iocore_net_poll", "[PollCont::pollEvent] backend_poll(%d,%f), result=%d", eio->backend_fd,pt,pollDescriptor->result);
+ Debug("iocore_net_poll", "[PollCont::pollEvent] backend_poll(%d,%f), result=%d", eio->backend_fd,pt,pollDescriptor->result);
#elif TS_USE_EPOLL
pollDescriptor->result = epoll_wait(pollDescriptor->epoll_fd,
pollDescriptor->ePoll_Triggered_Events, POLL_DESCRIPTOR_SIZE, poll_timeout);
- NetDebug("iocore_net_poll", "[PollCont::pollEvent] epoll_fd: %d, timeout: %d, results: %d", pollDescriptor->epoll_fd, poll_timeout,
+ Debug("iocore_net_poll", "[PollCont::pollEvent] epoll_fd: %d, timeout: %d, results: %d", pollDescriptor->epoll_fd, poll_timeout,
pollDescriptor->result);
#elif TS_USE_KQUEUE
struct timespec tv;
@@ -130,7 +130,7 @@ PollCont::pollEvent(int event, Event *e)
pollDescriptor->kq_Triggered_Events,
POLL_DESCRIPTOR_SIZE,
&tv);
- NetDebug("iocore_net_poll", "[PollCont::pollEvent] kueue_fd: %d, timeout: %d, results: %d", pollDescriptor->kqueue_fd, poll_timeout,
+ Debug("iocore_net_poll", "[PollCont::pollEvent] kueue_fd: %d, timeout: %d, results: %d", pollDescriptor->kqueue_fd, poll_timeout,
pollDescriptor->result);
#elif TS_USE_PORT
int retval;
@@ -157,7 +157,7 @@ PollCont::pollEvent(int event, Event *e)
} else {
pollDescriptor->result = (int)nget;
}
- NetDebug("iocore_net_poll", "[PollCont::pollEvent] %d[%s]=port_getn(%d,%p,%d,%d,%d),results(%d)",
+ Debug("iocore_net_poll", "[PollCont::pollEvent] %d[%s]=port_getn(%d,%p,%d,%d,%d),results(%d)",
retval,retval < 0 ? strerror(errno) : "ok",
pollDescriptor->port_fd, pollDescriptor->Port_Triggered_Events,
POLL_DESCRIPTOR_SIZE, nget, poll_timeout, pollDescriptor->result);
@@ -313,10 +313,10 @@ NetHandler::mainNetEvent(int event, Even
fd_reify(eio);
eio->backend_poll(eio, pt);
pd->result = eio->pendingcnt[0];
- NetDebug("iocore_net_main_poll", "[NetHandler::mainNetEvent] backend_poll(%d,%f), result=%d", eio->backend_fd,pt,pd->result);
+ Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] backend_poll(%d,%f), result=%d", eio->backend_fd,pt,pd->result);
#elif TS_USE_EPOLL
pd->result = epoll_wait(pd->epoll_fd, pd->ePoll_Triggered_Events, POLL_DESCRIPTOR_SIZE, poll_timeout);
- NetDebug("iocore_net_main_poll", "[NetHandler::mainNetEvent] epoll_wait(%d,%f), result=%d", pd->epoll_fd,poll_timeout,pd->result);
+ Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] epoll_wait(%d,%f), result=%d", pd->epoll_fd,poll_timeout,pd->result);
#elif TS_USE_KQUEUE
struct timespec tv;
tv.tv_sec = poll_timeout / 1000;
@@ -324,7 +324,7 @@ NetHandler::mainNetEvent(int event, Even
pd->result = kevent(pd->kqueue_fd, NULL, 0,
pd->kq_Triggered_Events, POLL_DESCRIPTOR_SIZE,
&tv);
- NetDebug("iocore_net_main_poll", "[NetHandler::mainNetEvent] kevent(%d,%f), result=%d", pd->kqueue_fd,poll_timeout,pd->result);
+ Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] kevent(%d,%f), result=%d", pd->kqueue_fd,poll_timeout,pd->result);
#elif TS_USE_PORT
int retval;
timespec_t ptimeout;
@@ -349,7 +349,7 @@ NetHandler::mainNetEvent(int event, Even
} else {
pd->result = (int)nget;
}
- NetDebug("iocore_net_main_poll", "[NetHandler::mainNetEvent] %d[%s]=port_getn(%d,%p,%d,%d,%d),results(%d)",
+ Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] %d[%s]=port_getn(%d,%p,%d,%d,%d),results(%d)",
retval,retval < 0 ? strerror(errno) : "ok",
pd->port_fd, pd->Port_Triggered_Events,
POLL_DESCRIPTOR_SIZE, nget, poll_timeout, pd->result);
@@ -369,7 +369,7 @@ NetHandler::mainNetEvent(int event, Even
read_ready_list.enqueue(vc);
else if (get_ev_events(pd,x) & EVENTIO_ERROR) {
// check for unhandled epoll events that should be handled
- NetDebug("iocore_net_main", "Unhandled epoll event on read: 0x%04x read.enabled=%d closed=%d read.netready_queue=%d",
+ Debug("iocore_net_main", "Unhandled epoll event on read: 0x%04x read.enabled=%d closed=%d read.netready_queue=%d",
get_ev_events(pd,x), vc->read.enabled, vc->closed, read_ready_list.in(vc));
}
}
@@ -381,12 +381,12 @@ NetHandler::mainNetEvent(int event, Even
write_ready_list.enqueue(vc);
else if (get_ev_events(pd,x) & EVENTIO_ERROR) {
// check for unhandled epoll events that should be handled
- NetDebug("iocore_net_main",
+ Debug("iocore_net_main",
"Unhandled epoll event on write: 0x%04x write.enabled=%d closed=%d write.netready_queue=%d",
get_ev_events(pd,x), vc->write.enabled, vc->closed, write_ready_list.in(vc));
}
} else if (!get_ev_events(pd,x) & EVENTIO_ERROR) {
- NetDebug("iocore_net_main", "Unhandled epoll event: 0x%04x", get_ev_events(pd,x));
+ Debug("iocore_net_main", "Unhandled epoll event: 0x%04x", get_ev_events(pd,x));
}
} else if (epd->type == EVENTIO_DNS_CONNECTION) {
if (epd->data.dnscon != NULL) {
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc Sun Oct 24 22:19:02 2010
@@ -431,7 +431,7 @@ NetAccept::acceptFastEvent(int event, vo
if (likely(fd >= 0)) {
vc->addLogMessage("accepting the connection");
- NetDebug("iocore_net", "accepted a new socket: %d", fd);
+ Debug("iocore_net", "accepted a new socket: %d", fd);
if (send_bufsize > 0) {
if (unlikely(socketManager.set_sndbuf_size(fd, send_bufsize))) {
bufsz = ROUNDUP(send_bufsize, 1024);
@@ -454,11 +454,11 @@ NetAccept::acceptFastEvent(int event, vo
}
if (sockopt_flags & 1) { // we have to disable Nagle
safe_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ON, sizeof(int));
- NetDebug("socket", "::acceptFastEvent: setsockopt() TCP_NODELAY on socket");
+ Debug("socket", "::acceptFastEvent: setsockopt() TCP_NODELAY on socket");
}
if (sockopt_flags & 2) {
safe_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, ON, sizeof(int));
- NetDebug("socket", "::acceptFastEvent: setsockopt() SO_KEEPALIVE on socket");
+ Debug("socket", "::acceptFastEvent: setsockopt() SO_KEEPALIVE on socket");
}
do {
res = safe_nonblocking(fd);
@@ -518,7 +518,7 @@ NetAccept::acceptFastEvent(int event, vo
#ifdef USE_EDGE_TRIGGER
// Set the vc as triggered and place it in the read ready queue in case there is already data on the socket.
- NetDebug("iocore_net", "acceptEvent : Setting triggered and adding to the read ready queue");
+ Debug("iocore_net", "acceptEvent : Setting triggered and adding to the read ready queue");
vc->read.triggered = 1;
vc->nh->read_ready_list.enqueue(vc);
#endif
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc Sun Oct 24 22:19:02 2010
@@ -77,7 +77,7 @@ NetProcessor::accept(Continuation * cont
(void) accept_only; // NT only
(void) bound_sockaddr; // NT only
(void) bound_sockaddr_size; // NT only
- NetDebug("iocore_net_processor",
+ Debug("iocore_net_processor",
"NetProcessor::accept - port %d,recv_bufsize %d, send_bufsize %d, sockopt 0x%0lX",
port, recv_bufsize, send_bufsize, sockopt_flags
);
@@ -107,7 +107,7 @@ NetProcessor::main_accept(Continuation *
)
{
(void) accept_only; // NT only
- NetDebug("iocore_net_processor", "NetProcessor::main_accept - port %d,recv_bufsize %d, send_bufsize %d, sockopt 0x%0lX",
+ Debug("iocore_net_processor", "NetProcessor::main_accept - port %d,recv_bufsize %d, send_bufsize %d, sockopt 0x%0lX",
opt.port, opt.recv_bufsize, opt.send_bufsize, opt.sockopt_flags);
return ((UnixNetProcessor *) this)->accept_internal(cont, fd,
bound_sockaddr,
@@ -231,7 +231,7 @@ UnixNetProcessor::connect_re_internal(Co
Action *result = &vc->action_;
#ifndef INK_NO_SOCKS
if (using_socks) {
- NetDebug("Socks", "Using Socks ip: %u.%u.%u.%u:%d\n", PRINT_IP(ip), port);
+ Debug("Socks", "Using Socks ip: %u.%u.%u.%u:%d\n", PRINT_IP(ip), port);
socksEntry = socksAllocator.alloc();
socksEntry->init(cont->mutex, vc, opt->socks_support, opt->socks_version); /*XXXX remove last two args */
socksEntry->action_ = cont;
@@ -246,7 +246,7 @@ UnixNetProcessor::connect_re_internal(Co
result = &socksEntry->action_;
vc->action_ = socksEntry;
} else {
- NetDebug("Socks", "Not Using Socks %d \n", socks_conf_stuff->socks_needed);
+ Debug("Socks", "Not Using Socks %d \n", socks_conf_stuff->socks_needed);
vc->action_ = cont;
}
#else
@@ -303,7 +303,7 @@ struct CheckConnect:public Continuation
switch (event) {
case NET_EVENT_OPEN:
vc = (UnixNetVConnection *) e;
- NetDebug("iocore_net_connect", "connect Net open");
+ Debug("iocore_net_connect", "connect Net open");
vc->do_io_write(this, 10, /* some non-zero number just to get the poll going */
reader);
/* dont wait for more than timeout secs */
@@ -312,7 +312,7 @@ struct CheckConnect:public Continuation
break;
case NET_EVENT_OPEN_FAILED:
- NetDebug("iocore_net_connect", "connect Net open failed");
+ Debug("iocore_net_connect", "connect Net open failed");
if (!action_.cancelled)
action_.continuation->handleEvent(NET_EVENT_OPEN_FAILED, (void *) e);
break;
@@ -325,7 +325,7 @@ struct CheckConnect:public Continuation
ret = getsockopt(vc->con.fd, SOL_SOCKET, SO_ERROR, (char *) &sl, &sz);
if (!ret && sl == 0)
{
- NetDebug("iocore_net_connect", "connection established");
+ Debug("iocore_net_connect", "connection established");
/* disable write on vc */
vc->write.enabled = 0;
vc->cancel_inactivity_timeout();
@@ -346,7 +346,7 @@ struct CheckConnect:public Continuation
action_.continuation->handleEvent(NET_EVENT_OPEN_FAILED, (void *) -ENET_CONNECT_FAILED);
break;
case VC_EVENT_INACTIVITY_TIMEOUT:
- NetDebug("iocore_net_connect", "connect timed out");
+ Debug("iocore_net_connect", "connect timed out");
vc->do_io_close();
if (!action_.cancelled)
action_.continuation->handleEvent(NET_EVENT_OPEN_FAILED, (void *) -ENET_CONNECT_TIMEOUT);
@@ -395,7 +395,7 @@ Action *
NetProcessor::connect_s(Continuation * cont, unsigned int ip,
int port, int timeout, NetVCOptions * opt)
{
- NetDebug("iocore_net_connect", "NetProcessor::connect_s called");
+ Debug("iocore_net_connect", "NetProcessor::connect_s called");
CheckConnect *c = NEW(new CheckConnect(cont->mutex));
return c->connect_s(cont, ip, port, timeout, opt);
}
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc Sun Oct 24 22:19:02 2010
@@ -318,7 +318,7 @@ read_from_net(NetHandler *nh, UnixNetVCo
buf.writer()->fill(r);
#ifdef DEBUG
if (buf.writer()->write_avail() <= 0)
- NetDebug("iocore_net", "read_from_net, read buffer full");
+ Debug("iocore_net", "read_from_net, read buffer full");
#endif
s->vio.ndone += r;
net_activity(vc, thread);
@@ -331,7 +331,7 @@ read_from_net(NetHandler *nh, UnixNetVCo
ink_assert(ntodo >= 0);
if (s->vio.ntodo() <= 0) {
read_signal_done(VC_EVENT_READ_COMPLETE, nh, vc);
- NetDebug("iocore_net", "read_from_net, read finished - signal done");
+ Debug("iocore_net", "read_from_net, read finished - signal done");
return;
} else {
if (read_signal_and_update(VC_EVENT_READ_READY, vc) != EVENT_CONT)
@@ -962,7 +962,7 @@ UnixNetVConnection::acceptEvent(int even
nh = get_NetHandler(thread);
PollDescriptor *pd = get_PollDescriptor(thread);
if (ep.start(pd, this, EVENTIO_READ|EVENTIO_WRITE) < 0) {
- NetDebug("iocore_net", "acceptEvent : failed EventIO::start\n");
+ Debug("iocore_net", "acceptEvent : failed EventIO::start\n");
close_UnixNetVConnection(this, e->ethread);
return EVENT_DONE;
}
@@ -1075,7 +1075,7 @@ UnixNetVConnection::connectUp(EThread *t
// Initialize this UnixNetVConnection
//
int res = 0;
- NetDebug("iocore_net", "connectUp:: local_addr=%u.%u.%u.%u [%s]\n",
+ Debug("iocore_net", "connectUp:: local_addr=%u.%u.%u.%u [%s]\n",
PRINT_IP(options.local_addr),
NetVCOptions::toString(options.addr_binding)
);
@@ -1088,7 +1088,7 @@ UnixNetVConnection::connectUp(EThread *t
// when edge triggering is used.
if (ep.start(get_PollDescriptor(t), this, EVENTIO_READ|EVENTIO_WRITE) < 0) {
lerrno = errno;
- NetDebug("iocore_net", "connectUp : Failed to add to epoll list\n");
+ Debug("iocore_net", "connectUp : Failed to add to epoll list\n");
action_.continuation->handleEvent(NET_EVENT_OPEN_FAILED, (void *) res);
free(t);
return CONNECT_FAILURE;
Modified: trafficserver/traffic/trunk/libinktomi++/Diags.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Diags.h?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Diags.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/Diags.h Sun Oct 24 22:19:02 2010
@@ -79,7 +79,7 @@ typedef enum
#define DiagsLevel_IsTerminal(_l) (((_l) >= DL_Fatal) && ((_l) < DL_Undefined))
-#ifndef INK_NO_DIAGS
+#ifdef TS_USE_DIAGS
// Cleanup Function Prototype - Called before ink_fatal to
// cleanup process state
typedef void (*DiagsCleanupFunc) ();
@@ -405,7 +405,7 @@ dummy_debug(const char *dummy_arg ...)
#define action_tag_assert(_t,_a) /**/
#endif
#define stat_debug_assert(_tst) (void)((_tst) || (Warning(#_tst), debug_tag_assert("stat_check",! #_tst), 0))
-#else // INK_NO_DIAGS
+#else // TS_USE_DIAGS
class Diags
{
@@ -446,5 +446,5 @@ dummy_debug(char *dummy_arg ...)
#define debug_tag_assert(_t,_a) /**/
#define action_tag_assert(_t,_a)
#define is_diags_on(_t) 0
-#endif // INK_NO_DIAGS
+#endif // TS_USE_DIAGS
#endif /*_Diags_h_*/
Modified: trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_config.h.in?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_config.h.in Sun Oct 24 22:19:02 2010
@@ -133,21 +133,22 @@
#define TS_HAS_V2STATS @has_v2stats@
#define TS_HAS_PURIFY @has_purify@
#define TS_HAS_DEMANGLE @has_demangle@
+#define TS_HAS_TESTS @has_tests@
/* XXX: Should make those individually selectable ? */
-/* TODO: Use ATS prefix instead no prefix or INK */
+/* TODO: Use TS prefix instead no prefix or INK */
#if TS_IS_MICRO_BUILD
# define TS_MICRO 1
# define INK_NO_ACL 1
# define INK_NO_CLUSTER 1
-# define INK_NO_DIAGS 1
+# define TS_USE_DIAGS 0
# define INK_NO_HOSTDB 1
# define INK_NO_ICP 1
# define INK_NO_LOG 1
# define INK_NO_REVERSE 1
# define INK_NO_SOCKS 1
# define INK_NO_STAT_PAGES 1
-# define INK_NO_TESTS 1
+# define TS_USE_TESTS 0
# define INK_USE_MUTEX_FOR_ATOMICLISTS 1
# define INK_USE_MUTEX_FOR_FREELISTS 1
# define USE_MD5_FOR_MMH 1
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Sun Oct 24 22:19:02 2010
@@ -153,7 +153,7 @@ int ssl_accept_file_descriptor = NO_FD;
char accept_fd_list[1024] = "";
char core_file[255] = "";
int command_flag = DEFAULT_COMMAND_FLAG;
-#ifndef INK_NO_TESTS
+#if TS_HAS_TESTS
char regression_test[1024] = "";
#endif
int auto_clear_hostdb_flag = 0;
@@ -195,10 +195,10 @@ static int cmd_line_dprintf_level = 0;
AppVersionInfo appVersionInfo; // Build info for this application
-#ifndef INK_NO_TESTS
-extern int test_net_processor();
-
+#if TS_HAS_TESTS
extern int run_TestHook();
+// TODO: Maybe review and "fix" this test at some point?
+//
//extern void run_SimpleHttp();
#endif
void deinitSubAgent();
@@ -233,7 +233,7 @@ ArgumentDescription argument_description
"PROXY_DPRINTF_LEVEL", NULL},
{"version", 'V', "Print Version String", "T", &version_flag,
NULL, NULL},
-#ifndef INK_NO_TESTS
+#if TS_HAS_TESTS
{"regression", 'R',
#ifdef DEBUG
"Regression Level (quick:1..long:3)",
@@ -256,7 +256,7 @@ ArgumentDescription argument_description
#endif
"T",
&run_test_hook, "PROXY_RUN_TEST_HOOK", NULL},
-#endif //INK_NO_TESTS
+#endif //TS_HAS_TESTS
#if TS_USE_DIAGS
{"debug_tags", 'T', "Vertical-bar-separated Debug Tags", "S1023", error_tags,
"PROXY_DEBUG_TAGS", NULL},
@@ -1421,7 +1421,7 @@ run_AutoStop()
eventProcessor.schedule_in(NEW(new AutoStopCont), HRTIME_SECONDS(atoi(getenv("PROXY_AUTO_EXIT"))));
}
-#ifndef INK_NO_TESTS
+#if TS_HAS_TESTS
struct RegressionCont: public Continuation
{
int initialized;
@@ -1459,7 +1459,7 @@ run_RegressionTest()
if (regression_level)
eventProcessor.schedule_every(NEW(new RegressionCont), HRTIME_SECONDS(1));
}
-#endif //INK_NO_TESTS
+#endif //TS_HAS_TESTS
static void
@@ -1917,11 +1917,6 @@ main(int argc, char **argv)
initCacheControl();
#endif
initCongestionControl();
-
- //initMixtAPIInternal();
- // #ifndef INK_NO_ACL
- // initContentControl();
- // #endif
initIPAllow();
initCacheInspectorAllow();
ParentConfig::startup();
@@ -2001,7 +1996,7 @@ main(int argc, char **argv)
// if in test hook mode, run the test hook //
/////////////////////////////////////////////
-#ifndef INK_NO_TESTS
+#if TS_HAS_TESTS
if (run_test_hook) {
Note("Running TestHook Instead of Main Server");
run_TestHook();
@@ -2078,17 +2073,15 @@ main(int argc, char **argv)
Note("traffic server running");
-#ifndef INK_NO_TESTS
+#if TS_HAS_TESTS
TransformTest::run();
-#endif
-
#ifndef INK_NO_HOSTDB
run_HostDBTest();
#endif
// run_SimpleHttp();
-#ifndef INK_NO_TESTS
run_RegressionTest();
#endif
+
run_AutoStop();
}
@@ -2186,7 +2179,7 @@ xmlBandwidthSchemaRead(XMLNode * node)
}
-#ifndef INK_NO_TESTS
+#if TS_HAS_TESTS
//////////////////////////////
// Unit Regresion Test Hook //
//////////////////////////////
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Sun Oct 24 22:19:02 2010
@@ -106,7 +106,6 @@ traffic_server_SOURCES = \
InkAPI.cc \
FetchSM.cc \
InkAPIInternal.h \
- InkAPITest.cc \
InkIOCoreAPI.cc \
InkXml.cc \
InkXml.h \
@@ -125,8 +124,6 @@ traffic_server_SOURCES = \
Prefetch.cc \
Prefetch.h \
Raf.h \
- RegressionSM.h \
- RegressionSM.cc \
ReverseProxy.cc \
ReverseProxy.h \
RniTransStats.h \
@@ -138,7 +135,6 @@ traffic_server_SOURCES = \
StatSystem.cc \
StatSystem.h \
StatAPITypes.cc \
- TestHook.cc \
Transform.cc \
Transform.h \
TransformInternal.h \
@@ -149,6 +145,12 @@ if BUILD_V2STATS
traffic_server_SOURCES += StatSystemV2.cc
endif
+if BUILD_TESTS
+ traffic_server_SOURCES += InkAPITest.cc \
+ RegressionSM.h \
+ RegressionSM.cc \
+ TestHook.cc
+endif
traffic_server_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_server_LDADD = \
@@ -205,8 +207,6 @@ traffic_logcat_LDADD = \
Transform.o \
Prefetch.o \
Update.o \
- TestHook.o \
- RegressionSM.o \
Plugin.o \
PluginDB.o \
InkAPI.o \
@@ -244,6 +244,11 @@ if BUILD_V2STATS
traffic_logcat_LDADD += StatSystemV2.o
endif
+if BUILD_TESTS
+ traffic_logcat_LDADD += RegressionSM.o \
+ TestHook.o
+endif
+
traffic_logstats_SOURCES = logstats.cc
traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_logstats_LDADD = \
@@ -271,8 +276,6 @@ traffic_logstats_LDADD = \
Transform.o \
Prefetch.o \
Update.o \
- TestHook.o \
- RegressionSM.o \
Plugin.o \
PluginDB.o \
InkAPI.o \
@@ -311,6 +314,11 @@ if BUILD_V2STATS
traffic_logstats_LDADD += StatSystemV2.o
endif
+if BUILD_TESTS
+ traffic_logstats_LDADD += RegressionSM.o \
+ TestHook.o
+endif
+
traffic_sac_SOURCES = sac.cc
traffic_sac_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_sac_LDADD = \
@@ -338,8 +346,6 @@ traffic_sac_LDADD = \
Transform.o \
Prefetch.o \
Update.o \
- TestHook.o \
- RegressionSM.o \
Plugin.o \
PluginDB.o \
InkAPI.o \
@@ -376,6 +382,11 @@ if BUILD_V2STATS
traffic_sac_LDADD += StatSystemV2.o
endif
+if BUILD_TESTS
+ traffic_sac_LDADD += RegressionSM.o \
+ TestHook.o
+endif
+
traffic_cust_log_fmt_cnvrt_SOURCES = cust_log_fmt_cnvrt.cc
traffic_cust_log_fmt_cnvrt_LDADD = \
$(top_builddir)/iocore/utils/libinkutils.a \
Modified: trafficserver/traffic/trunk/proxy/PluginVC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/PluginVC.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/PluginVC.cc (original)
+++ trafficserver/traffic/trunk/proxy/PluginVC.cc Sun Oct 24 22:19:02 2010
@@ -1155,7 +1155,7 @@ PluginVCCore::set_active_data(void *data
*
**************************************************************/
-
+#if TS_HAS_TESTS
class PVCTestDriver:public NetTestDriver
{
public:
@@ -1248,3 +1248,4 @@ EXCLUSIVE_REGRESSION_TEST(PVC) (Regressi
PVCTestDriver *driver = NEW(new PVCTestDriver);
driver->start_tests(t, pstatus);
}
+#endif
Modified: trafficserver/traffic/trunk/proxy/SimpleHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/SimpleHttp.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/SimpleHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/SimpleHttp.cc Sun Oct 24 22:19:02 2010
@@ -31,6 +31,8 @@
#include "Diags.h"
#include "HTTP.h"
+// TODO: This should be changed later to use TS_HAS_TESTS, but currently, the test
+// most likely isn't functional.
#if COMPILE_SIMPLE_HTTP
#define HISTORY_SIZE 0
Modified: trafficserver/traffic/trunk/proxy/Transform.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Transform.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Transform.cc (original)
+++ trafficserver/traffic/trunk/proxy/Transform.cc Sun Oct 24 22:19:02 2010
@@ -568,15 +568,6 @@ TransformControl::TransformControl()
SET_HANDLER(&TransformControl::handle_event);
m_hooks.append(transformProcessor.null_transform(new_ProxyMutex()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
-// m_hooks.append (transformProcessor.null_transform (new_ProxyMutex ()));
}
/*-------------------------------------------------------------------------
@@ -642,7 +633,7 @@ TransformControl::handle_event(int event
-------------------------------------------------------------------------*/
NullTransform::NullTransform(ProxyMutex *_mutex)
-:INKVConnInternal(NULL, _mutex), m_output_buf(NULL), m_output_reader(NULL), m_output_vio(NULL)
+ : INKVConnInternal(NULL, _mutex), m_output_buf(NULL), m_output_reader(NULL), m_output_vio(NULL)
{
SET_HANDLER(&NullTransform::handle_event);
@@ -770,6 +761,7 @@ NullTransform::handle_event(int event, v
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
+#ifdef TS_HAS_TESTS
void
TransformTest::run()
{
@@ -777,6 +769,7 @@ TransformTest::run()
eventProcessor.schedule_imm(NEW(new TransformControl()), ET_NET);
}
}
+#endif
@@ -791,15 +784,13 @@ TransformTest::run()
inline static int
num_chars_for_int(int i)
{
- int k;
+ int k = 1;
if (i < 0)
return 0;
- k = 1;
-
while ((i /= 10) != 0)
- k++;
+ ++k;
return k;
}
@@ -808,18 +799,17 @@ num_chars_for_int(int i)
/*-------------------------------------------------------------------------
-------------------------------------------------------------------------*/
-RangeTransform::RangeTransform(ProxyMutex *mut, MIMEField *range_field,
- HTTPInfo *cache_obj, HTTPHdr *transform_resp)
-:INKVConnInternal(NULL, mut),
-m_output_buf(NULL),
-m_output_reader(NULL),
-m_range_field(range_field),
-m_transform_resp(transform_resp),
-m_output_vio(NULL),
-m_unsatisfiable_range(true),
-m_not_handle_range(false),
-m_num_range_fields(0),
-m_current_range(0), m_content_type(NULL), m_content_type_len(0), m_ranges(NULL), m_output_cl(0), m_done(0)
+RangeTransform::RangeTransform(ProxyMutex *mut, MIMEField *range_field, HTTPInfo *cache_obj, HTTPHdr *transform_resp)
+ :INKVConnInternal(NULL, mut),
+ m_output_buf(NULL),
+ m_output_reader(NULL),
+ m_range_field(range_field),
+ m_transform_resp(transform_resp),
+ m_output_vio(NULL),
+ m_unsatisfiable_range(true),
+ m_not_handle_range(false),
+ m_num_range_fields(0),
+ m_current_range(0), m_content_type(NULL), m_content_type_len(0), m_ranges(NULL), m_output_cl(0), m_done(0)
{
SET_HANDLER(&RangeTransform::handle_event);
Modified: trafficserver/traffic/trunk/proxy/Transform.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Transform.h?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Transform.h (original)
+++ trafficserver/traffic/trunk/proxy/Transform.h Sun Oct 24 22:19:02 2010
@@ -39,21 +39,20 @@ public:
void start();
public:
- VConnection * open(Continuation * cont, APIHook * hooks);
-
+ VConnection * open(Continuation * cont, APIHook * hooks);
INKVConnInternal *null_transform(ProxyMutex * mutex);
-
- INKVConnInternal *range_transform(ProxyMutex * mutex,
- MIMEField * range_field, HTTPInfo * cache_obj, HTTPHdr * transform_resp, bool & b);
-
+ INKVConnInternal *range_transform(ProxyMutex * mutex, MIMEField * range_field, HTTPInfo * cache_obj,
+ HTTPHdr * transform_resp, bool & b);
};
+#ifdef TS_HAS_TESTS
class TransformTest
{
public:
static void run();
};
+#endif
extern TransformProcessor transformProcessor;
Modified: trafficserver/traffic/trunk/proxy/congest/Congestion.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Congestion.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Congestion.cc (original)
+++ trafficserver/traffic/trunk/proxy/congest/Congestion.cc Sun Oct 24 22:19:02 2010
@@ -369,15 +369,16 @@ CongestionControlDefaultSchemeChanged(co
//-----------------------------------------------
extern void init_CongestionRegressionTest();
-#define CC_EstablishStaticConfigInteger(v, n) \
- REC_EstablishStaticConfigInt32(v, n)
-#define CC_EstablishStaticConfigStringAlloc(v, n) \
- REC_EstablishStaticConfigStringAlloc(v, n)
+#define CC_EstablishStaticConfigInteger(v, n) REC_EstablishStaticConfigInt32(v, n)
+#define CC_EstablishStaticConfigStringAlloc(v, n) REC_EstablishStaticConfigStringAlloc(v, n)
void
initCongestionControl()
{
+ // TODO: This is very, very strange, we run the regression tests even on a normal startup??
+#if TS_HAS_TESTS
init_CongestionRegressionTest();
+#endif
ink_assert(CongestionMatcher == NULL);
// register the stats variables
register_congest_stats();
Modified: trafficserver/traffic/trunk/proxy/congest/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Makefile.am?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/congest/Makefile.am Sun Oct 24 22:19:02 2010
@@ -35,5 +35,8 @@ libCongestionControl_a_SOURCES = \
CongestionDB.h \
CongestionStats.cc \
CongestionStats.h \
- CongestionTest.cc \
MT_hashtable.h
+
+if BUILD_TESTS
+ libCongestionControl_a_SOURCES += CongestionTest.cc
+endif
Modified: trafficserver/traffic/trunk/proxy/hdrs/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/Makefile.am?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/Makefile.am Sun Oct 24 22:19:02 2010
@@ -27,8 +27,6 @@ EXTRA_PROGRAMS = load_http_hdr
libhdrs_a_SOURCES = \
HdrHeap.cc \
HdrHeap.h \
- HdrTest.cc \
- HdrTest.h \
HdrToken.cc \
HdrToken.h \
HdrTSOnly.cc \
@@ -45,6 +43,11 @@ libhdrs_a_SOURCES = \
URL.cc \
URL.h
+if BUILD_TESTS
+ libhdrs_a_SOURCES += HdrTest.cc \
+ HdrTest.h
+endif
+
load_http_hdr_SOURCES = \
HdrHeap.h \
HTTP.h \
Modified: trafficserver/traffic/trunk/proxy/hdrs/URL.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/URL.h?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/URL.h (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/URL.h Sun Oct 24 22:19:02 2010
@@ -36,7 +36,7 @@ enum URLType
{
URL_TYPE_NONE,
URL_TYPE_HTTP,
- URL_TYPE_HTTPS,
+ URL_TYPE_HTTPS
};
struct URLImpl:public HdrHeapObjImpl
Modified: trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc Sun Oct 24 22:19:02 2010
@@ -352,7 +352,7 @@ start_HttpProxyServer(int fd, int port,
// HttpStateMachine::dump_state_machines();
}
#endif
-#ifndef INK_NO_TESTS
+#if TS_HAS_TESTS
if (is_action_tag_set("http_update_test")) {
init_http_update_test();
}
Modified: trafficserver/traffic/trunk/proxy/http2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/Makefile.am?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/http2/Makefile.am Sun Oct 24 22:19:02 2010
@@ -70,5 +70,8 @@ libhttp_a_SOURCES = \
HttpTunnel.cc \
HttpTunnel.h \
HttpUpdateSM.cc \
- HttpUpdateSM.h \
- HttpUpdateTester.cc
+ HttpUpdateSM.h
+
+if BUILD_TESTS
+ libhttp_a_SOURCES += HttpUpdateTester.cc
+endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am?rev=1026907&r1=1026906&r2=1026907&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/Makefile.am Sun Oct 24 22:19:02 2010
@@ -24,7 +24,9 @@ AM_CPPFLAGS = \
MGMT_DEFS = @MGMT_DEFS@
DEFS += $(MGMT_DEFS)
-noinst_PROGRAMS = traffic_api_cli_remote
+if BUILD_TESTS
+ noinst_PROGRAMS = traffic_api_cli_remote
+endif
noinst_LIBRARIES = libmgmtapiremote.a
libmgmtapiremote_a_SOURCES = \
@@ -41,7 +43,10 @@ libmgmtapiremote_a_SOURCES = \
NetworkUtilsRemote.cc \
NetworkUtilsRemote.h
-traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
+if BUILD_TESTS
+ traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
+endif
+
traffic_api_cli_remote_LDADD = \
libmgmtapiremote.a \
$(top_builddir)/iocore/utils/libinkutils.a \