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/03/21 20:17:44 UTC
svn commit: r1083908 - in /trafficserver/traffic/trunk: ./ iocore/net/
lib/ts/
Author: zwoop
Date: Mon Mar 21 19:17:44 2011
New Revision: 1083908
URL: http://svn.apache.org/viewvc?rev=1083908&view=rev
Log:
TS-550 Remove an unused / unsupported debug tool
Removed:
trafficserver/traffic/trunk/iocore/net/DetailedLog.cc
trafficserver/traffic/trunk/iocore/net/DetailedLog.h
Modified:
trafficserver/traffic/trunk/configure.ac
trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h
trafficserver/traffic/trunk/iocore/net/Makefile.am
trafficserver/traffic/trunk/iocore/net/UnixNet.cc
trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
trafficserver/traffic/trunk/lib/ts/ink_config.h.in
Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1083908&r1=1083907&r2=1083908&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Mon Mar 21 19:17:44 2011
@@ -297,20 +297,6 @@ AS_IF([test "x$enable_api" = "xyes"], [h
AC_SUBST(has_inkapi)
#
-# Detailed Logging (for debugging purposes)
-#
-AC_MSG_CHECKING([whether to enable detailed logging for debugging purposes])
-AC_ARG_ENABLE([detailed-log],
- [AS_HELP_STRING([--enable-detailed-log],[enable detailed logging])],
- [],
- [enable_detailed_log=no]
-)
-AC_MSG_RESULT([$enable_detailed_log])
-TS_ARG_ENABLE_VAR([has],[detailed-log])
-AC_SUBST(has_detailed_log)
-AM_CONDITIONAL([BUILD_DETAILED_LOG], [test 0 -ne $has_detailed_log])
-
-#
# WCCP
#
AC_MSG_CHECKING([whether to enable WCCP v2 support])
Modified: trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h?rev=1083908&r1=1083907&r2=1083908&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_NetVConnection.h Mon Mar 21 19:17:44 2011
@@ -32,10 +32,6 @@
#include "I_IOBuffer.h"
#include "I_Socks.h"
-#if TS_USE_DETAILED_LOG
-#include "DetailedLog.h"
-#endif
-
#define CONNECT_SUCCESS 1
#define CONNECT_FAILURE 0
@@ -457,55 +453,6 @@ public:
is_other_side_transparent = value;
}
-#if TS_USE_DETAILED_LOG
- void loggingInit()
- {
- if (logging == NULL) {
- logging = new DetailedLog();
- }
- }
- void addLogMessage(const char *message)
- {
- if (logging != NULL) {
- logging->add(message);
- logging->print();
- }
- }
- void printLogs() const
- {
- if (logging != NULL)
- {
- logging->print();
- }
- }
- void clearLogs()
- {
- if (logging != NULL) {
- logging->clear();
- }
- }
- ink_hrtime getLogsTotalTime() const
- {
- if (logging != NULL)
- {
- return logging->totalTime();
- } else
- {
- return 0;
- }
- }
- bool loggingEnabled() const
- {
- return (logging != NULL);
- }
- DetailedLog *logging;
-#else
- // These are here to simplify the usage of these APIs, i.e. no need to
- // add the #ifdef TS_USE_DETAILED_LOG a million times.
- void addLogMessage(const char *message) { NOWARN_UNUSED(message); }
- bool loggingEnabled() const { return false; }
-#endif
-
private:
NetVConnection(const NetVConnection &);
NetVConnection & operator =(const NetVConnection &);
@@ -532,9 +479,6 @@ NetVConnection::NetVConnection():
VConnection(NULL),
attributes(0),
thread(NULL),
-#if TS_USE_DETAILED_LOG
- logging(NULL),
-#endif
got_local_addr(0),
got_remote_addr(0),
is_internal_request(false),
Modified: trafficserver/traffic/trunk/iocore/net/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Makefile.am?rev=1083908&r1=1083907&r2=1083908&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/net/Makefile.am Mon Mar 21 19:17:44 2011
@@ -95,11 +95,3 @@ 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 += \
- DetailedLog.cc \
- DetailedLog.h
-endif
Modified: trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=1083908&r1=1083907&r2=1083908&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNet.cc Mon Mar 21 19:17:44 2011
@@ -352,7 +352,6 @@ NetHandler::mainNetEvent(int event, Even
vc = epd->data.vc;
if (get_ev_events(pd,x) & (EVENTIO_READ|EVENTIO_ERROR)) {
vc->read.triggered = 1;
- vc->addLogMessage("read triggered");
if (!read_ready_list.in(vc))
read_ready_list.enqueue(vc);
else if (get_ev_events(pd,x) & EVENTIO_ERROR) {
@@ -364,7 +363,6 @@ NetHandler::mainNetEvent(int event, Even
vc = epd->data.vc;
if (get_ev_events(pd,x) & (EVENTIO_WRITE|EVENTIO_ERROR)) {
vc->write.triggered = 1;
- vc->addLogMessage("write triggered");
if (!write_ready_list.in(vc))
write_ready_list.enqueue(vc);
else if (get_ev_events(pd,x) & EVENTIO_ERROR) {
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc?rev=1083908&r1=1083907&r2=1083908&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetAccept.cc Mon Mar 21 19:17:44 2011
@@ -99,9 +99,6 @@ net_accept(NetAccept * na, void *ep, boo
NET_SUM_GLOBAL_DYN_STAT(net_connections_currently_open_stat, 1);
vc->id = net_next_connection_number();
na->alloc_cache = vc;
-#if TS_USE_DETAILED_LOG
- vc->loggingInit();
-#endif
}
if ((res = na->server.accept(&vc->con)) < 0) {
if (res == -EAGAIN || res == -ECONNABORTED || res == -EPIPE)
@@ -310,9 +307,6 @@ NetAccept::do_blocking_accept(NetAccept
vc->from_accept_thread = true;
vc->id = net_next_connection_number();
master_na->alloc_cache = vc;
-#if TS_USE_DETAILED_LOG
- vc->loggingInit();
-#endif
}
ink_hrtime now = ink_get_hrtime();
@@ -430,13 +424,7 @@ NetAccept::acceptFastEvent(int event, vo
socklen_t sz = sizeof(vc->con.sa);
int fd = socketManager.accept(server.fd, (struct sockaddr *) &vc->con.sa, &sz);
-#if TS_USE_DETAILED_LOG
- vc->loggingInit();
-#endif
-
if (likely(fd >= 0)) {
- vc->addLogMessage("accepting the connection");
-
Debug("iocore_net", "accepted a new socket: %d", fd);
if (send_bufsize > 0) {
if (unlikely(socketManager.set_sndbuf_size(fd, send_bufsize))) {
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc?rev=1083908&r1=1083907&r2=1083908&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetVConnection.cc Mon Mar 21 19:17:44 2011
@@ -94,16 +94,6 @@ net_activity(UnixNetVConnection *vc, ETh
void
close_UnixNetVConnection(UnixNetVConnection *vc, EThread *t)
{
-#if TS_USE_DETAILED_LOG
- if (vc->loggingEnabled()) {
- vc->addLogMessage("close_UnixNetVConnection");
- // display the slow log for the http client session
- if (vc->getLogsTotalTime() / HRTIME_MSECOND > 100)
- vc->printLogs();
- vc->clearLogs();
- }
-#endif
-
vc->cancel_OOB();
vc->ep.stop();
vc->con.close();
@@ -214,7 +204,6 @@ write_signal_error(NetHandler *nh, UnixN
static void
read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
{
- vc->addLogMessage("read from net");
NetState *s = &vc->read;
ProxyMutex *mutex = thread->mutex;
MIOBufferAccessor & buf = s->vio.buffer;
@@ -223,13 +212,11 @@ read_from_net(NetHandler *nh, UnixNetVCo
MUTEX_TRY_LOCK_FOR(lock, s->vio.mutex, thread, s->vio._cont);
if (!lock || lock.m.m_ptr != s->vio.mutex.m_ptr) {
- vc->addLogMessage("can't get lock");
read_reschedule(nh, vc);
return;
}
// if it is not enabled.
if (!s->enabled || s->vio.op != VIO::READ) {
- vc->addLogMessage("not enabled");
read_disable(nh, vc);
return;
}
@@ -279,11 +266,6 @@ read_from_net(NetHandler *nh, UnixNetVCo
total_read += rattempted;
} while (r == rattempted && total_read < toread);
- if (vc->loggingEnabled()) {
- char message[256];
- snprintf(message, sizeof(message), "rval: %" PRId64 " toread: %" PRId64 " ntodo: %" PRId64 " total_read: %" PRId64 "", r, toread, ntodo, total_read);
- vc->addLogMessage(message);
- }
// if we have already moved some bytes successfully, summarize in r
if (total_read != rattempted) {
if (r <= 0)
@@ -296,7 +278,6 @@ read_from_net(NetHandler *nh, UnixNetVCo
if (r == -EAGAIN || r == -ENOTCONN) {
NET_DEBUG_COUNT_DYN_STAT(net_calls_to_read_nodata_stat, 1);
- vc->addLogMessage("EAGAIN or ENOTCONN");
vc->read.triggered = 0;
nh->read_ready_list.remove(vc);
return;
@@ -373,15 +354,12 @@ write_to_net(NetHandler *nh, UnixNetVCon
void
write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
{
- vc->addLogMessage("write to net io");
-
NetState *s = &vc->write;
ProxyMutex *mutex = thread->mutex;
MUTEX_TRY_LOCK_FOR(lock, s->vio.mutex, thread, s->vio._cont);
if (!lock || lock.m.m_ptr != s->vio.mutex.m_ptr) {
- vc->addLogMessage("can't get lock");
write_reschedule(nh, vc);
return;
}
@@ -459,12 +437,7 @@ write_to_net_io(NetHandler *nh, UnixNetV
int64_t total_wrote = 0, wattempted = 0;
int64_t r = vc->load_buffer_and_write(towrite, wattempted, total_wrote, buf);
- if (vc->loggingEnabled()) {
- char message[256];
- snprintf(message, sizeof(message), "rval: %" PRId64 " towrite: %" PRId64 " ntodo: %" PRId64 " total_wrote: %" PRId64 "",
- r, towrite, ntodo, total_wrote);
- vc->addLogMessage(message);
- }
+
// if we have already moved some bytes successfully, summarize in r
if (total_wrote != wattempted) {
if (r <= 0)
@@ -527,7 +500,6 @@ write_to_net_io(NetHandler *nh, UnixNetV
VIO *
UnixNetVConnection::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
{
- addLogMessage("do_io_read");
ink_assert(!closed);
read.vio.op = VIO::READ;
read.vio.mutex = c->mutex;
@@ -549,7 +521,6 @@ UnixNetVConnection::do_io_read(Continuat
VIO *
UnixNetVConnection::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *reader, bool owner)
{
- addLogMessage("do_io_write");
ink_assert(!closed);
write.vio.op = VIO::WRITE;
write.vio.mutex = c->mutex;
@@ -572,8 +543,6 @@ UnixNetVConnection::do_io_write(Continua
void
UnixNetVConnection::do_io_close(int alerrno /* = -1 */ )
{
- addLogMessage("UnixNetVConnection::do_io_close");
-
disable_read(this);
disable_write(this);
read.vio.buffer.clear();
@@ -601,7 +570,6 @@ UnixNetVConnection::do_io_close(int aler
void
UnixNetVConnection::do_io_shutdown(ShutdownHowTo_t howto)
{
- addLogMessage("UnixNetVConnection::do_io_shutdown");
switch (howto) {
case IO_SHUTDOWN_READ:
socketManager.shutdown(((UnixNetVConnection *) this)->con.fd, 0);
@@ -986,9 +954,7 @@ UnixNetVConnection::acceptEvent(int even
int
UnixNetVConnection::mainEvent(int event, Event *e)
{
- addLogMessage("main event");
ink_debug_assert(event == EVENT_IMMEDIATE || event == EVENT_INTERVAL);
- /* BZ 31932 */
ink_debug_assert(thread == this_ethread());
MUTEX_TRY_LOCK(hlock, get_NetHandler(thread)->mutex, e->ethread);
@@ -1063,8 +1029,6 @@ UnixNetVConnection::mainEvent(int event,
int
UnixNetVConnection::connectUp(EThread *t)
{
- addLogMessage("connectUp");
-
thread = t;
if (check_net_throttle(CONNECT, submit_time)) {
check_throttle_warning();
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=1083908&r1=1083907&r2=1083908&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_config.h.in (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_config.h.in Mon Mar 21 19:17:44 2011
@@ -105,7 +105,6 @@
#define TS_USE_KQUEUE @use_kqueue@
#define TS_USE_PORT @use_port@
#define TS_USE_POSIX_CAP @use_posix_cap@
-#define TS_USE_DETAILED_LOG @has_detailed_log@
#define TS_USE_TPROXY @use_tproxy@
/* OS API definitions */