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/11/19 23:30:48 UTC
svn commit: r1037062 - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/ iocore/net/ proxy/ proxy/http2/
proxy/logging/ proxy/mgmt2/ proxy/mgmt2/preparse/ test/deft/docs/
Author: zwoop
Date: Fri Nov 19 22:30:47 2010
New Revision: 1037062
URL: http://svn.apache.org/viewvc?rev=1037062&view=rev
Log:
TS-544 Eliminate streaming media config, and some cleanup.
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h
trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h
trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
trafficserver/traffic/trunk/proxy/StatSystem.cc
trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
trafficserver/traffic/trunk/proxy/http2/HttpConfig.h
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
trafficserver/traffic/trunk/proxy/logging/Log.cc
trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc
trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html
Modified: trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Fri Nov 19 22:30:47 2010
@@ -473,7 +473,6 @@ The Apache Traffic Server Administration
proxy.config.http.slow.log.threshold
proxy.config.http.snarf_username_from_authorization
proxy.config.http.connect_ports
- proxy.config.http.streaming_connect_attempts_timeout
proxy.config.http.transaction_active_timeout_in
proxy.config.http.transaction_active_timeout_out
proxy.config.http.transaction_no_activity_timeout_in
Modified: trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_UDPPacket.h Fri Nov 19 22:30:47 2010
@@ -56,7 +56,6 @@ public:
void setArrivalTime(ink_hrtime t);
IOBufferBlock *getIOBlockChain();
void setReliabilityPkt();
- void setPktTSSeq(int64 seqno);
int getPktLength();
/**
Add IOBufferBlock (chain) to end of packet.
Modified: trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UDPPacket.h Fri Nov 19 22:30:47 2010
@@ -60,15 +60,6 @@ public:
bool isReliabilityPkt;
int reqGenerationNum;
- // Associate a TS seq. # with each packet... We need this for WMT---WMT
- // maintains its own sequence numbers that need to increment by 1 on each
- // packet send. Since packets can be cancelled during a seek, WMT needs to
- // know the next "WMT seq. #" that it can tag to a packet. To determine the
- // "WMT seq. #", WMT code maintains a mapping betweeen WMT seq. # and TS
- // seq. #. If pktTSSeqNum is set to -1, then this value is ignored by the
- // UDP code.
- int64 pktTSSeqNum;
-
ink_hrtime delivery_time; // when to deliver packet
ink_hrtime arrival_time; // when packet arrived
@@ -93,7 +84,6 @@ UDPPacketInternal::UDPPacketInternal()
, pktLength(0)
, isReliabilityPkt(false)
, reqGenerationNum(0)
- , pktTSSeqNum(-1)
, delivery_time(0)
, arrival_time(0)
, cont(NULL)
@@ -145,13 +135,6 @@ UDPPacket::setReliabilityPkt()
}
TS_INLINE void
-UDPPacket::setPktTSSeq(int64 seqno)
-{
- UDPPacketInternal *p = (UDPPacketInternal *) this;
- p->pktTSSeqNum = seqno;
-}
-
-TS_INLINE void
UDPPacket::append_block(IOBufferBlock * block)
{
UDPPacketInternal *p = (UDPPacketInternal *) this;
Modified: trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Fri Nov 19 22:30:47 2010
@@ -1078,7 +1078,6 @@ UDPQueue::SendUDPPacket(UDPPacketInterna
int n, count, iov_len = 0;
if (!p->isReliabilityPkt) {
- p->conn->SetLastSentPktTSSeqNum(p->pktTSSeqNum);
p->conn->lastSentPktStartTime = p->delivery_time;
}
Modified: trafficserver/traffic/trunk/proxy/StatSystem.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatSystem.cc?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatSystem.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatSystem.cc Fri Nov 19 22:30:47 2010
@@ -145,7 +145,6 @@ static int non_persistent_stats[] = {
/////////////////////////////////////
// Start of Scheduled Update stats
/////////////////////////////////////
- // WMT stats
// DNS
//dns_success_time_stat
};
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc Fri Nov 19 22:30:47 2010
@@ -1214,8 +1214,6 @@ HttpConfig::startup()
HttpEstablishStaticConfigLongLong(c.connect_attempts_rr_retries, "proxy.config.http.connect_attempts_rr_retries");
HttpEstablishStaticConfigLongLong(c.connect_attempts_timeout, "proxy.config.http.connect_attempts_timeout");
- HttpEstablishStaticConfigLongLong(c.streaming_connect_attempts_timeout,
- "proxy.config.http.streaming_connect_attempts_timeout");
HttpEstablishStaticConfigLongLong(c.post_connect_attempts_timeout, "proxy.config.http.post_connect_attempts_timeout");
HttpEstablishStaticConfigLongLong(c.parent_connect_attempts, "proxy.config.http.parent_proxy.total_connect_attempts");
HttpEstablishStaticConfigLongLong(c.per_parent_connect_attempts,
@@ -1572,7 +1570,6 @@ HttpConfig::reconfigure()
params->connect_attempts_max_retries_dead_server = m_master.connect_attempts_max_retries_dead_server;
params->connect_attempts_rr_retries = m_master.connect_attempts_rr_retries;
params->connect_attempts_timeout = m_master.connect_attempts_timeout;
- params->streaming_connect_attempts_timeout = m_master.streaming_connect_attempts_timeout;
params->post_connect_attempts_timeout = m_master.post_connect_attempts_timeout;
params->parent_connect_attempts = m_master.parent_connect_attempts;
params->per_parent_connect_attempts = m_master.per_parent_connect_attempts;
Modified: trafficserver/traffic/trunk/proxy/http2/HttpConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpConfig.h?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpConfig.h Fri Nov 19 22:30:47 2010
@@ -498,7 +498,6 @@ public:
MgmtInt connect_attempts_max_retries_dead_server;
MgmtInt connect_attempts_rr_retries;
MgmtInt connect_attempts_timeout;
- MgmtInt streaming_connect_attempts_timeout;
MgmtInt post_connect_attempts_timeout;
MgmtInt parent_connect_attempts;
MgmtInt per_parent_connect_attempts;
@@ -916,7 +915,6 @@ connect_attempts_max_retries(0),
connect_attempts_max_retries_dead_server(0),
connect_attempts_rr_retries(0),
connect_attempts_timeout(0),
-streaming_connect_attempts_timeout(0),
post_connect_attempts_timeout(0),
parent_connect_attempts(0),
per_parent_connect_attempts(0),
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Fri Nov 19 22:30:47 2010
@@ -4153,8 +4153,6 @@ HttpSM::do_cache_prepare_action(HttpCach
}
-inline bool is_request_from_streaming_client(HTTPHdr * hdr);
-
//////////////////////////////////////////////////////////////////////////
//
// HttpStateMachineGet::do_http_server_open()
@@ -4357,8 +4355,6 @@ HttpSM::do_http_server_open(bool raw)
MgmtInt connect_timeout;
if (t_state.method == HTTP_WKSIDX_POST || t_state.method == HTTP_WKSIDX_PUT) {
connect_timeout = t_state.http_config_param->post_connect_attempts_timeout;
- } else if (is_request_from_streaming_client(&t_state.hdr_info.client_request)) {
- connect_timeout = t_state.http_config_param->streaming_connect_attempts_timeout;
} else if (t_state.current.server == &t_state.parent_info) {
connect_timeout = t_state.http_config_param->parent_connect_timeout;
} else {
@@ -5150,49 +5146,6 @@ HttpSM::write_header_into_buffer(HTTPHdr
return dumpoffset;
}
-inline bool
-is_request_from_streaming_client(HTTPHdr * hdr)
-{
- if (!hdr->valid())
- return false;
-
- if (hdr->presence(MIME_PRESENCE_USER_AGENT)) {
- int length;
- const char *user_agent = hdr->value_get(MIME_FIELD_USER_AGENT,
- MIME_LEN_USER_AGENT, &length);
-
- // be as efficient as possible - avoid unnecessary calls to memcmp
- if (length <= 0)
- return false;
-
- switch (*user_agent) {
- case 'Q':
- // QTS - QuickTime
- if (length > 2 && memcmp(user_agent + 1, "TS", 2) == 0)
- return true;
- break;
- case 'R':
- // RMA, RealPlayer or RealMediaPlayer - Real
- if (length > 2 && memcmp(user_agent + 1, "MA", 2) == 0)
- return true;
- else if (length > 9 && memcmp(user_agent + 1, "ealPlayer", 9) == 0)
- return true;
- else if (length > 14 && memcmp(user_agent + 1, "ealMediaPlayer", 14) == 0)
- return true;
- break;
- case 'N':
- // NSPlayer - WMT
- if (length > 7 && memcmp(user_agent + 1, "SPlayer", 7) == 0)
- return true;
- break;
- default:
- break;
- }
- }
-
- return false;
-}
-
void
HttpSM::attach_server_session(HttpServerSession * s)
{
@@ -5244,8 +5197,6 @@ HttpSM::attach_server_session(HttpServer
MgmtInt connect_timeout;
if (t_state.method == HTTP_WKSIDX_POST || t_state.method == HTTP_WKSIDX_PUT) {
connect_timeout = t_state.http_config_param->post_connect_attempts_timeout;
- } else if (is_request_from_streaming_client(&t_state.hdr_info.client_request)) {
- connect_timeout = t_state.http_config_param->streaming_connect_attempts_timeout;
} else if (t_state.current.server == &t_state.parent_info) {
connect_timeout = t_state.http_config_param->parent_connect_timeout;
} else {
Modified: trafficserver/traffic/trunk/proxy/logging/Log.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/Log.cc?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/Log.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/Log.cc Fri Nov 19 22:30:47 2010
@@ -829,104 +829,74 @@ Log::init_fields()
ink_hash_table_insert(field_symbol_hash, symbol, field)
// This field is for the client DNS name.
- // For some protocols (such as WMT), the client itself sends the DNS
- // name to the server in a logging message. This field logs that.
// It's probably expensive to do DNS lookups, so this field should normally
// be blank unless the protocol allows an inexpensive way to determine
// the client DNS name.
//
- // For WMT, this is equivalent to c-dns
- //
ADD_LOG_FIELD("client_dns_name", "cdns", LogField::STRING,
&LogAccess::marshal_client_dns_name, &LogAccess::unmarshal_str);
// This field is for the client operating system name.
//
- // For WMT, this is equivalent to c-os
- //
ADD_LOG_FIELD("client_dns_name", "cos", LogField::STRING, &LogAccess::marshal_client_os, &LogAccess::unmarshal_str);
// This field is for the client operating system version.
//
- // For WMT, this is equivalent to c-osversion
- //
ADD_LOG_FIELD("client_os_version", "cosv", LogField::STRING,
&LogAccess::marshal_client_os_version, &LogAccess::unmarshal_str);
// This field is for the client CPU type.
//
- // For WMT, this is equivalent to c-cpu
- //
ADD_LOG_FIELD("client_cpu", "ccpu", LogField::STRING, &LogAccess::marshal_client_cpu, &LogAccess::unmarshal_str);
// This field is for the client player version.
//
- // For WMT, this is equivalent to c-playerversion
- //
ADD_LOG_FIELD("client_player_version", "cplyv", LogField::STRING,
&LogAccess::marshal_client_player_version, &LogAccess::unmarshal_str);
// This field is for the client player lanaguage.
//
- // For WMT, this is equivalent to c-playerlanguage.
- //
ADD_LOG_FIELD("client_player_language", "clang", LogField::STRING,
&LogAccess::marshal_client_player_language, &LogAccess::unmarshal_str);
// This field is for the client user agent.
//
- // For WMT, this is equivalent to c(User-Agent)
- //
ADD_LOG_FIELD("client_user_agent", "cua", LogField::STRING,
&LogAccess::marshal_client_user_agent, &LogAccess::unmarshal_str);
// This field is for the URL of the referrer.
//
- // For WMT, this is equivalent to c(Referer)
- //
ADD_LOG_FIELD("referer_url", "rfurl", LogField::STRING, &LogAccess::marshal_referer_url, &LogAccess::unmarshal_str);
// This field is for the audio codec used by the player.
//
- // For WMT, this is equivalent to audiocodec
- //
ADD_LOG_FIELD("audio_codec", "audcdc", LogField::STRING, &LogAccess::marshal_audio_codec, &LogAccess::unmarshal_str);
// This field is for the video codec used by the player.
//
- // For WMT, this is equivalent to videocodec
- //
ADD_LOG_FIELD("video_codec", "vidcdc", LogField::STRING, &LogAccess::marshal_video_codec, &LogAccess::unmarshal_str);
// This field is for the number of bytes received by the client
// as reported by the client.
//
- // For WMT, this is equivalent to c-bytes
- //
ADD_LOG_FIELD("client_bytes_received", "cbytr", LogField::sINT,
&LogAccess::marshal_client_bytes_received, &LogAccess::unmarshal_int_to_str);
// This field is for the number of packets received by the client
// as reported by the client.
//
- // For WMT, this is equivalent to c-pkts-received
- //
ADD_LOG_FIELD("client_pkts_received", "cpktr", LogField::sINT,
&LogAccess::marshal_client_pkts_received, &LogAccess::unmarshal_int_to_str);
// This field is for the number of lost packets during transmission
// from server to client as reported by the client.
//
- // For WMT, this is equivalent to c-pkts-lost-client
- //
ADD_LOG_FIELD("client_lost_pkts", "cpktl", LogField::sINT,
&LogAccess::marshal_client_lost_pkts, &LogAccess::unmarshal_int_to_str);
// This field is for the number of lost packets in the network layer
// as reported by the client.
//
- // For WMT, this is equivalent to c-pkts-lost-net
- //
ADD_LOG_FIELD("client_lost_net_pkts", "cpktln", LogField::sINT,
&LogAccess::marshal_client_lost_net_pkts, &LogAccess::unmarshal_int_to_str);
@@ -934,54 +904,40 @@ Log::init_fields()
// transmission from the server to a client on the network layer as
// reported by the client.
//
- // For WMT, this is equivalent to c-lost-cont-net
- //
ADD_LOG_FIELD("client_lost_continuous_pkts", "cpktlcn", LogField::sINT,
&LogAccess::marshal_client_lost_continuous_pkts, &LogAccess::unmarshal_int_to_str);
// This field is for the number of packets recovered using ECC
// as reported by the client.
//
- // For WMT, this is equivalent to c-pkts-recovered-ECC
- //
ADD_LOG_FIELD("client_pkts_ecc_recover", "cpktecc", LogField::sINT,
&LogAccess::marshal_client_pkts_ecc_recover, &LogAccess::unmarshal_int_to_str);
// This field is for the number of packets recovered from resent
// requests as reported by the client.
//
- // For WMT, this is equivalent to c-pkts-recovered-resent
- //
ADD_LOG_FIELD("client_pkts_resent_recover", "crstrc", LogField::sINT,
&LogAccess::marshal_client_pkts_resent_recover, &LogAccess::unmarshal_int_to_str);
// This field is for the number of resend requests sent by the client
// as reported by the client.
//
- // For WMT, this is equivalent to c-pkt-resendreqs
- //
ADD_LOG_FIELD("client_resend_request", "crstrq", LogField::sINT,
&LogAccess::marshal_client_resend_request, &LogAccess::unmarshal_int_to_str);
// This field is for the number of rebuffers as reported by the
// client.
//
- // For WMT, this is equivalent to c-buffercount
- //
ADD_LOG_FIELD("client_buffer_count", "cbufc", LogField::sINT,
&LogAccess::marshal_client_buffer_count, &LogAccess::unmarshal_int_to_str);
// This field is the total buffer time of a client in seconds.
//
- // For WMT, this is equivalent to c-totalbuffertime
- //
ADD_LOG_FIELD("client_buffer_ts", "cbufs", LogField::sINT,
&LogAccess::marshal_client_buffer_ts, &LogAccess::unmarshal_int_to_str);
// This field is the percent quality as reported by the client.
//
- // For WMT, this is equivalent to c-quality
- //
ADD_LOG_FIELD("client_quality_per", "cqalp", LogField::sINT,
&LogAccess::marshal_client_quality_per, &LogAccess::unmarshal_int_to_str);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Fri Nov 19 22:30:47 2010
@@ -814,9 +814,6 @@ RecordElement RecordsConfig[] = {
,
{CONFIG, "proxy.config.http.connect_attempts_timeout", "", INK_INT, "30", RU_REREAD, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.http.streaming_connect_attempts_timeout", "", INK_INT, "1800", RU_REREAD, RR_NULL, RC_NULL,
- NULL, RA_NULL}
- ,
{CONFIG, "proxy.config.http.post_connect_attempts_timeout", "", INK_INT, "1800", RU_REREAD, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
Modified: trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc Fri Nov 19 22:30:47 2010
@@ -167,16 +167,6 @@ parseRemapFile(int fd)
toPath++;
toPathLen--;
}
-
- // INKqa09603
- // check to see if there's an extra tag(RNI/QT/WMT) for Media-IXT
- if (numToks == 4) { // there's a tag
- if (strcmp(whiteTok[3], "RNI") != 0 && strcmp(whiteTok[3], "QT") != 0 && strcmp(whiteTok[3], "WMT") != 0) {
- err = "Invalid Tag";
- goto FAIL;
- }
- }
-
}
}
}
Modified: trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html?rev=1037062&r1=1037061&r2=1037062&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html (original)
+++ trafficserver/traffic/trunk/test/deft/docs/test_tool_docs.html Fri Nov 19 22:30:47 2010
@@ -95,7 +95,6 @@ run_manager: 1
<li> <b> rafPort </b> - RAF service port</b> </li>
<li> <b> tsHttpPort </b> - HTTP Proxy Port </b> </li>
<li> <b> tsRtspPort </b> - RTSP Proxy Port</b> </li>
- <li> <b> tsWmtPort </b> - WMT Proxy Port </li>
</ul>
</td>
</tr>