Author: zym
Date: Fri Aug 12 01:51:40 2011
New Revision: 1156936
URL: http://svn.apache.org/viewvc?rev=1156936&view=rev
Log:
TS-914 fix iocore_net_main_poll debug info in UnixNet.cc
Author: taorui
Review: zym
Modified:
trafficserver/traffic/trunk/CHANGES
trafficserver/traffic/trunk/iocore/net/UnixNet.cc
Modified: trafficserver/traffic/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1156936&r1=1156935&r2=1156936&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Fri Aug 12 01:51:40 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.1.0
+ *) [TS-914] fix iocore_net_main_poll debug info in UnixNet.cc
+ Author: taorui
+
*) [TS-911] Remove unecessary lock in HTTP accept.
*) [TS-908] HostDB now stores IPv6 addresses.
Modified: trafficserver/traffic/trunk/iocore/net/UnixNet.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNet.cc?rev=1156936&r1=1156935&r2=1156936&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNet.cc Fri Aug 12 01:51:40 2011
@@ -298,13 +298,13 @@ NetHandler::mainNetEvent(int event, Even
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);
- NetDebug("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,%d), result=%d", pd->epoll_fd,poll_timeout,pd->result);
#elif TS_USE_KQUEUE
struct timespec tv;
tv.tv_sec = poll_timeout / 1000;
tv.tv_nsec = 1000000 * (poll_timeout % 1000);
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);
+ NetDebug("iocore_net_main_poll", "[NetHandler::mainNetEvent] kevent(%d,%d),
result=%d", pd->kqueue_fd,poll_timeout,pd->result);
#elif TS_USE_PORT
int retval;
timespec_t ptimeout;
