You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2009/12/07 17:57:52 UTC
svn commit: r887999 [2/2] - in /incubator/trafficserver/traffic/trunk:
iocore/block-cache/ iocore/cluster/ iocore/dns/ iocore/eventsystem/
iocore/net/ libinktomi++/ proxy/ proxy/http2/ proxy/logging/ proxy/mgmt2/
Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc?rev=887999&r1=887998&r2=887999&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTunnel.cc Mon Dec 7 16:57:50 2009
@@ -79,7 +79,7 @@
// INKqa05737 - since we explictly disabled the vc by setting
// nbytes = ndone when going into flow control, we need
// set nbytes up again here
- p->read_vio->set_nbytes(INT_MAX);
+ p->read_vio->nbytes = INT_MAX;
p->read_vio->reenable();
}
} else {
@@ -1003,7 +1003,7 @@
// we will move the server to a keep alive state. Since
// we are prohibited from changing the buffer, we need
// make sure the iocore doesn't schedule a read
- p->read_vio->set_nbytes(p->read_vio->ndone);
+ p->read_vio->nbytes = p->read_vio->ndone;
return VC_EVENT_READ_READY;
}
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc?rev=887999&r1=887998&r2=887999&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogCollationClientSM.cc Mon Dec 7 16:57:50 2009
@@ -265,10 +265,6 @@
case VC_EVENT_WRITE_COMPLETE:
Debug("log2-coll", "[%d]client::client_auth - WRITE_COMPLETE", m_id);
- // stats
- // we now take care of updating the stats in Log::flush_thread_main
- //SUM_DYN_STAT (log2_stat_bytes_sent_to_network_stat, vio->get_ndone());
-
Note("[log-coll] host up [%d.%d.%d.%d:%d]",
((unsigned char *) (&(m_log_host->m_ip)))[0],
((unsigned char *) (&(m_log_host->m_ip)))[1],
@@ -713,10 +709,6 @@
case VC_EVENT_WRITE_COMPLETE:
Debug("log2-coll", "[%d]client::client_send - WRITE_COMPLETE", m_id);
- // stats
- // we now take care of updating the stats in Log::flush_thread_main
- //SUM_DYN_STAT (log2_stat_bytes_sent_to_network_stat, vio->get_ndone());
-
ink_assert(m_buffer_in_iocore != NULL);
#if defined(LOG_BUFFER_TRACKING)
Debug("log2-buftrak", "[%d]client::client_send - network write complete", m_buffer_in_iocore->header()->id);
Modified: incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc?rev=887999&r1=887998&r2=887999&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc Mon Dec 7 16:57:50 2009
@@ -59,7 +59,6 @@
int ftp_accept_file_descriptor = -1;
int auto_clear_hostdb_flag = 0;
char proxy_name[256] = "unknown";
-int last_net_mode = 1;
char system_config_directory[PATH_NAME_MAX + 1] = "conf/yts";
char management_directory[256] = "conf/yts";
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=887999&r1=887998&r2=887999&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Mon Dec 7 16:57:50 2009
@@ -40,10 +40,6 @@
#include "WebReconfig.h"
#include "MgmtSocket.h"
-#ifdef BSD_TCP
-#include "inkio.h"
-#endif
-
int bindProxyPort(int, in_addr_t, int);
bool
@@ -1293,11 +1289,7 @@
}
if (*proxy_server_port_attributes[i] != 'D') {
-#ifdef BSD_TCP
- if ((safe_listen(proxy_server_fd[i], 1024)) < 0) {
-#else
if ((listen(proxy_server_fd[i], 1024)) < 0) {
-#endif
mgmt_fatal(stderr, "[LocalManager::listenForProxy] Unable to listen on socket: %d\n", proxy_server_port[i]);
}
mgmt_log(stderr, "[LocalManager::listenForProxy] Listening on port: %d\n", proxy_server_port[i]);
@@ -1371,39 +1363,21 @@
}
/* Setup reliable connection, for large config changes */
-#ifdef BSD_TCP
- if ((proxy_port_fd = ink_socket(AF_INET, type, 0)) < 0) {
-#else
if ((proxy_port_fd = socket(AF_INET, type, 0)) < 0) {
-#endif
mgmt_elog(stderr, "[bindProxyPort] Unable to create socket : %s\n", strerror(errno));
_exit(1);
}
-#ifdef BSD_TCP
- if (safe_setsockopt(proxy_port_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof(int)) < 0) {
-#else
if (setsockopt(proxy_port_fd, SOL_SOCKET, SO_REUSEADDR, (char *) &one, sizeof(int)) < 0) {
-#endif
mgmt_elog(stderr, "[bindProxyPort] Unable to set socket options: %d : %s\n", proxy_port, strerror(errno));
_exit(1);
}
-#if !defined(BSD_TCP)
- if (fcntl(proxy_port_fd, F_SETFD, 0) < 0) {
- mgmt_elog(stderr, "[bindProxyPort] Unable to set fcntl: %d : %s\n", proxy_port, strerror(errno));
- _exit(1);
- }
-#endif
memset(&proxy_addr, 0, sizeof(proxy_addr));
proxy_addr.sin_family = AF_INET;
proxy_addr.sin_addr.s_addr = incoming_ip_to_bind;
proxy_addr.sin_port = htons(proxy_port);
-#ifdef BSD_TCP
- if ((safe_bind(proxy_port_fd, (struct sockaddr *) &proxy_addr, sizeof(proxy_addr))) < 0) {
-#else
if ((bind(proxy_port_fd, (struct sockaddr *) &proxy_addr, sizeof(proxy_addr))) < 0) {
-#endif
mgmt_elog(stderr, "[bindProxyPort] Unable to bind socket: %d : %s\n", proxy_port, strerror(errno));
_exit(1);
}
@@ -1420,7 +1394,6 @@
} /* End bindProxyPort */
-
void
LocalManager::signalAlarm(int alarm_id, char *desc, char *ip)
{
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=887999&r1=887998&r2=887999&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Mon Dec 7 16:57:50 2009
@@ -50,10 +50,6 @@
#include "HTTP.h"
#include "RecordsConfig.h"
-#ifdef BSD_TCP
-#include "inkio.h"
-#endif
-
#if defined(HAVE_LIBSSL) && defined(TRAFFIC_NET)
#include "traffic_net/tn_Thread.h"
#endif
@@ -358,9 +354,6 @@
// Set up the application version info
appVersionInfo.setup("traffic_manager", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
-#ifdef BSD_TCP
- inkio_initialize();
-#endif
initSignalHandlers();
// Process Environment Variables
Modified: incubator/trafficserver/traffic/trunk/proxy/test_ClusterHashStandalone.c
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/test_ClusterHashStandalone.c?rev=887999&r1=887998&r2=887999&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/test_ClusterHashStandalone.c (original)
+++ incubator/trafficserver/traffic/trunk/proxy/test_ClusterHashStandalone.c Mon Dec 7 16:57:50 2009
@@ -49,4 +49,5 @@
printf("cluster IP ('%s') = %d.%d.%d.%d\n", urls[i],
(ipaddr >> 24) & 0xFF, (ipaddr >> 16) & 0xFF, (ipaddr >> 8) & 0xFF, (ipaddr >> 0) & 0xFF);
}
+ return 0;
}