You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2011/07/26 21:37:08 UTC
svn commit: r1151219 - in /trafficserver/traffic/trunk/iocore/net: I_Net.h
I_NetConfig.h Makefile.am Net.cc NetConfig.cc P_UnixNet.h
Author: amc
Date: Tue Jul 26 19:37:07 2011
New Revision: 1151219
URL: http://svn.apache.org/viewvc?rev=1151219&view=rev
Log:
NetConfig files executed by order of Igor. The few trinkets left were moved to I_Net.h and I_Net.cc.
Removed:
trafficserver/traffic/trunk/iocore/net/I_NetConfig.h
trafficserver/traffic/trunk/iocore/net/NetConfig.cc
Modified:
trafficserver/traffic/trunk/iocore/net/I_Net.h
trafficserver/traffic/trunk/iocore/net/Makefile.am
trafficserver/traffic/trunk/iocore/net/Net.cc
trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
Modified: trafficserver/traffic/trunk/iocore/net/I_Net.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_Net.h?rev=1151219&r1=1151218&r2=1151219&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_Net.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_Net.h Tue Jul 26 19:37:07 2011
@@ -66,6 +66,16 @@
static int const NO_FD = -1;
+static unsigned int const DEFAULT_POLL_TIMEOUT =
+#if defined(solaris)
+ 30 /* mseconds */
+#else
+ 10 /* mseconds */
+#endif
+ ;
+
+extern int net_config_poll_timeout;
+
#define NET_EVENT_OPEN (NET_EVENT_EVENTS_START)
#define NET_EVENT_OPEN_FAILED (NET_EVENT_EVENTS_START+1)
#define NET_EVENT_ACCEPT (NET_EVENT_EVENTS_START+2)
@@ -91,8 +101,6 @@ static int const NO_FD = -1;
#define ET_NET ET_CALL
-//struct socks_conf_struct;
-#include "I_NetConfig.h"
#include "I_NetVConnection.h"
#include "I_NetProcessor.h"
#include "I_UDPNet.h"
Modified: trafficserver/traffic/trunk/iocore/net/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Makefile.am?rev=1151219&r1=1151218&r2=1151219&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/net/Makefile.am Tue Jul 26 19:37:07 2011
@@ -39,7 +39,6 @@ noinst_LIBRARIES = libinknet.a
libinknet_a_SOURCES = \
Connection.cc \
- I_NetConfig.h \
I_NetErrno.h \
I_Net.h \
I_NetProcessor.h \
@@ -49,7 +48,6 @@ libinknet_a_SOURCES = \
I_UDPNet.h \
I_UDPPacket.h \
Net.cc \
- NetConfig.cc \
NetVConnection.cc \
P_CompletionUtil.h \
P_Connection.h \
Modified: trafficserver/traffic/trunk/iocore/net/Net.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/Net.cc?rev=1151219&r1=1151218&r2=1151219&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/Net.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/Net.cc Tue Jul 26 19:37:07 2011
@@ -32,6 +32,7 @@
#include "P_Net.h"
RecRawStatBlock *net_rsb = NULL;
+int net_config_poll_timeout = DEFAULT_POLL_TIMEOUT;
static inline void
configure_net(void)
Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNet.h?rev=1151219&r1=1151218&r2=1151219&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNet.h Tue Jul 26 19:37:07 2011
@@ -209,7 +209,7 @@ extern int http_accept_port_number;
#define MAX_NET_BUCKETS 256
#define MAX_EPOLL_ARRAY_SIZE (1024*16)
#define MAX_EPOLL_TIMEOUT 50 /* mseconds */
-/* NOTE: moved DEFAULT_POLL_TIMEOUT to I_NetConfig.h */
+/* NOTE: moved DEFAULT_POLL_TIMEOUT to I_Net.h */
#define NET_THROTTLE_DELAY 50 /* mseconds */
#define INK_MIN_PRIORITY 0