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/06/03 21:39:19 UTC
svn commit: r951129 - in /trafficserver/traffic/tags/2.1.1: ./
iocore/dns/DNS.cc proxy/logstats.cc
Author: zwoop
Date: Thu Jun 3 19:39:18 2010
New Revision: 951129
URL: http://svn.apache.org/viewvc?rev=951129&view=rev
Log:
Merged from trunk
Modified:
trafficserver/traffic/tags/2.1.1/ (props changed)
trafficserver/traffic/tags/2.1.1/iocore/dns/DNS.cc
trafficserver/traffic/tags/2.1.1/proxy/logstats.cc
Propchange: trafficserver/traffic/tags/2.1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 3 19:39:18 2010
@@ -1,2 +1,2 @@
/incubator/trafficserver/traffic/branches/dev:891823-915885
-/trafficserver/traffic/trunk:950804
+/trafficserver/traffic/trunk:950804,951057,951117
Modified: trafficserver/traffic/tags/2.1.1/iocore/dns/DNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.1/iocore/dns/DNS.cc?rev=951129&r1=951128&r2=951129&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.1/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/tags/2.1.1/iocore/dns/DNS.cc Thu Jun 3 19:39:18 2010
@@ -1121,7 +1121,7 @@ dns_result(DNSHandler * h, DNSEntry * e,
if (!e->post(h, ent, true))
return;
Lretry:
- e->result_ent = ent ? ent : BAD_DNS_RESULT;
+ e->result_ent = ent;
e->retries = 0;
if (e->timeout)
e->timeout->cancel();
@@ -1144,6 +1144,7 @@ DNSEntry::post(DNSHandler * h, HostEnt *
ink_sem_post(&sem);
#endif
} else {
+ result_ent = ent;
if (h->mutex->thread_holding == submit_thread) {
MUTEX_TRY_LOCK(lock, action.mutex, h->mutex->thread_holding);
if (!lock) {
@@ -1152,7 +1153,6 @@ DNSEntry::post(DNSHandler * h, HostEnt *
}
postEvent(0, 0);
} else {
- result_ent = ent;
mutex = action.mutex;
SET_HANDLER(&DNSEntry::postEvent);
submit_thread->schedule_imm_signal(this);
Modified: trafficserver/traffic/tags/2.1.1/proxy/logstats.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.1/proxy/logstats.cc?rev=951129&r1=951128&r2=951129&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.1/proxy/logstats.cc (original)
+++ trafficserver/traffic/tags/2.1.1/proxy/logstats.cc Thu Jun 3 19:39:18 2010
@@ -698,7 +698,7 @@ parse_log_buff(LogBufferHeader * buf_hea
switch (state) {
case P_STATE_ELAPSED:
state = P_STATE_IP;
- elapsed = ntohl(*((int64 *) (read_from)));
+ elapsed = *((int64 *) (read_from));
read_from += INK_MIN_ALIGN;
break;
@@ -713,7 +713,7 @@ parse_log_buff(LogBufferHeader * buf_hea
case P_STATE_RESULT:
state = P_STATE_CODE;
- result = ntohl(*((int64 *) (read_from)));
+ result = *((int64 *) (read_from));
read_from += INK_MIN_ALIGN;
if ((result<32) || (result> 255)) {
flag = 1;
@@ -723,7 +723,7 @@ parse_log_buff(LogBufferHeader * buf_hea
case P_STATE_CODE:
state = P_STATE_SIZE;
- http_code = ntohl(*((int64 *) (read_from)));
+ http_code = *((int64 *) (read_from));
read_from += INK_MIN_ALIGN;
if ((http_code<0) || (http_code> 999)) {
flag = 1;
@@ -736,7 +736,7 @@ parse_log_buff(LogBufferHeader * buf_hea
// Warning: This is not 64-bit safe, when converting the log format,
// this needs to be fixed as well.
state = P_STATE_METHOD;
- size = ntohl(*((int64 *) (read_from)));
+ size = *((int64 *) (read_from));
read_from += INK_MIN_ALIGN;
//printf("Size == %d\n", size)
break;
@@ -868,7 +868,7 @@ parse_log_buff(LogBufferHeader * buf_hea
case P_STATE_HIERARCHY:
state = P_STATE_PEER;
- hier = ntohl(*((int64 *) (read_from)));
+ hier = *((int64 *) (read_from));
switch (hier) {
case SQUID_HIER_NONE:
update_counter(totals.hierarchies.none, size);