You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2015/07/10 21:00:17 UTC
trafficserver git commit: TS-3313: Added active queue for incoming
connections Fixed clang analyzer issue
Repository: trafficserver
Updated Branches:
refs/heads/master 5ed6856e7 -> 9a11943fb
TS-3313: Added active queue for incoming connections
Fixed clang analyzer issue
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9a11943f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9a11943f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9a11943f
Branch: refs/heads/master
Commit: 9a11943fbfef1beb36778a8c143712ffcac3ae77
Parents: 5ed6856
Author: Bryan Call <bc...@apache.org>
Authored: Fri Jul 10 11:59:07 2015 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Jul 10 12:00:11 2015 -0700
----------------------------------------------------------------------
iocore/net/UnixNetVConnection.cc | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a11943f/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 8a35fa1..2758ecf 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -1123,8 +1123,10 @@ UnixNetVConnection::mainEvent(int event, Event *e)
e->schedule_in(HRTIME_MSECONDS(net_retry_delay));
return EVENT_CONT;
}
- if (e->cancelled)
+
+ if (e->cancelled) {
return EVENT_DONE;
+ }
int signal_event;
Event **signal_timeout;
@@ -1139,7 +1141,7 @@ UnixNetVConnection::mainEvent(int event, Event *e)
if (e == inactivity_timeout) {
signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
signal_timeout = &inactivity_timeout;
- } else if {
+ } else {
ink_assert(e == active_timeout);
signal_event = VC_EVENT_ACTIVE_TIMEOUT;
signal_timeout = &active_timeout;
@@ -1153,6 +1155,9 @@ UnixNetVConnection::mainEvent(int event, Event *e)
return EVENT_CONT;
signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
signal_timeout_at = &next_inactivity_timeout_at;
+ } else {
+ signal_event = VC_EVENT_ACTIVE_TIMEOUT;
+ signal_timeout_at = &next_activity_timeout_at;
}
#endif