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/26 21:09:47 UTC
svn commit: r1027687 - in /trafficserver/traffic/trunk: iocore/net/P_Net.h
iocore/net/UnixNet.cc iocore/net/UnixNetProcessor.cc
proxy/http2/HttpProxyServerMain.h
Author: zwoop
Date: Tue Oct 26 19:09:47 2010
New Revision: 1027687
URL: http://svn.apache.org/viewvc?rev=1027687&view=rev
Log:
Make some very verbose iocore Debug statements optional.
Modified:
trafficserver/traffic/trunk/iocore/net/P_Net.h
trafficserver/traffic/trunk/iocore/net/UnixNet.cc
trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.h
Modified: trafficserver/traffic/trunk/iocore/net/P_Net.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_Net.h?rev=1027687&r1=1027686&r2=1027687&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_Net.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_Net.h Tue Oct 26 19:09:47 2010
@@ -127,4 +127,12 @@ do { \
#define LIBEV_BACKEND_LIST 0 /* auto */
#endif
+// For very verbose iocore debugging.
+#ifndef DEBUG
+#define NetDebug if (0) dummy_debug
+#else
+#define NetDebug Debug
+#endif
+
+
#endif
Modified: trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=1027687&r1=1027686&r2=1027687&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNet.cc Tue Oct 26 19:09:47 2010
@@ -101,9 +101,9 @@ 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())) {
- 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());
+ NetDebug("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
} else {
poll_timeout = net_config_poll_timeout;
@@ -116,12 +116,12 @@ PollCont::pollEvent(int event, Event *e)
fd_reify(eio);
eio->backend_poll(eio, pt);
pollDescriptor->result = eio->pendingcnt[0];
- Debug("iocore_net_poll", "[PollCont::pollEvent] backend_poll(%d,%f), result=%d", eio->backend_fd,pt,pollDescriptor->result);
+ NetDebug("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);
- Debug("iocore_net_poll", "[PollCont::pollEvent] epoll_fd: %d, timeout: %d, results: %d", pollDescriptor->epoll_fd, poll_timeout,
- pollDescriptor->result);
+ NetDebug("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;
tv.tv_sec = poll_timeout / 1000;
@@ -130,8 +130,8 @@ PollCont::pollEvent(int event, Event *e)
pollDescriptor->kq_Triggered_Events,
POLL_DESCRIPTOR_SIZE,
&tv);
- Debug("iocore_net_poll", "[PollCont::pollEvent] kueue_fd: %d, timeout: %d, results: %d", pollDescriptor->kqueue_fd, poll_timeout,
- pollDescriptor->result);
+ NetDebug("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;
timespec_t ptimeout;
@@ -157,7 +157,7 @@ PollCont::pollEvent(int event, Event *e)
} else {
pollDescriptor->result = (int)nget;
}
- Debug("iocore_net_poll", "[PollCont::pollEvent] %d[%s]=port_getn(%d,%p,%d,%d,%d),results(%d)",
+ NetDebug("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];
- Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] backend_poll(%d,%f), result=%d", eio->backend_fd,pt,pd->result);
+ NetDebug("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);
- Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] epoll_wait(%d,%f), result=%d", pd->epoll_fd,poll_timeout,pd->result);
+ NetDebug("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);
- Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] kevent(%d,%f), result=%d", pd->kqueue_fd,poll_timeout,pd->result);
+ NetDebug("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;
}
- Debug("iocore_net_main_poll", "[NetHandler::mainNetEvent] %d[%s]=port_getn(%d,%p,%d,%d,%d),results(%d)",
+ NetDebug("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);
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc?rev=1027687&r1=1027686&r2=1027687&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc Tue Oct 26 19:09:47 2010
@@ -108,7 +108,7 @@ NetProcessor::main_accept(Continuation *
{
(void) accept_only; // NT only
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);
+ opt.port, opt.recv_bufsize, opt.send_bufsize, opt.sockopt_flags);
return ((UnixNetProcessor *) this)->accept_internal(cont, fd,
bound_sockaddr,
bound_sockaddr_size,
Modified: trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.h?rev=1027687&r1=1027686&r2=1027687&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.h Tue Oct 26 19:09:47 2010
@@ -29,6 +29,6 @@ void init_HttpProxyServer(void);
descriptor should be opened.
*/
-void start_HttpProxyServer(int fd, int port, int ssl_fd = NO_FD, int accept_threads = 0);
+void start_HttpProxyServer(int fd, int port, int ssl_fd, int accept_threads = 0);
void start_HttpProxyServerBackDoor(int port, int accept_threads = 0);