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/06 17:54:45 UTC
[2/2] trafficserver git commit: TS-3486: clang-format
TS-3486: clang-format
(cherry picked from commit 1a160e13e4931fbaa522339c99abfad1ce9d638c)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7b4c7852
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7b4c7852
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7b4c7852
Branch: refs/heads/6.0.x
Commit: 7b4c78527e6dc2061c79e1b442f37b176c0930f4
Parents: 97b9bc4
Author: Phil Sorber <so...@apache.org>
Authored: Mon Jun 29 16:18:14 2015 -0600
Committer: Bryan Call <bc...@apache.org>
Committed: Mon Jul 6 08:54:27 2015 -0700
----------------------------------------------------------------------
proxy/http/HttpSessionManager.cc | 11 +++++++----
proxy/http/HttpSessionManager.h | 3 ++-
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b4c7852/proxy/http/HttpSessionManager.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionManager.cc b/proxy/http/HttpSessionManager.cc
index 80067d6..5feb9c4 100644
--- a/proxy/http/HttpSessionManager.cc
+++ b/proxy/http/HttpSessionManager.cc
@@ -75,7 +75,8 @@ ServerSessionPool::match(HttpServerSession *ss, sockaddr const *addr, INK_MD5 co
}
HSMresult_t
-ServerSessionPool::acquireSession(sockaddr const *addr, INK_MD5 const &hostname_hash, TSServerSessionSharingMatchType match_style, HttpServerSession *&to_return)
+ServerSessionPool::acquireSession(sockaddr const *addr, INK_MD5 const &hostname_hash, TSServerSessionSharingMatchType match_style,
+ HttpServerSession *&to_return)
{
HSMresult_t zret = HSM_NOT_FOUND;
if (TS_SERVER_SESSION_SHARING_MATCH_HOST == match_style) {
@@ -265,7 +266,9 @@ HttpSessionManager::acquire_session(Continuation * /* cont ATS_UNUSED */, sockad
// Now check to see if we have a connection in our shared connection pool
EThread *ethread = this_ethread();
- ProxyMutex * pool_mutex = (TS_SERVER_SESSION_SHARING_POOL_THREAD == sm->t_state.http_config_param->server_session_sharing_pool) ? ethread->server_session_pool->mutex : m_g_pool->mutex;
+ ProxyMutex *pool_mutex = (TS_SERVER_SESSION_SHARING_POOL_THREAD == sm->t_state.http_config_param->server_session_sharing_pool) ?
+ ethread->server_session_pool->mutex :
+ m_g_pool->mutex;
MUTEX_TRY_LOCK(lock, pool_mutex, ethread);
if (lock.is_locked()) {
if (TS_SERVER_SESSION_SHARING_POOL_THREAD == sm->t_state.http_config_param->server_session_sharing_pool) {
@@ -278,9 +281,9 @@ HttpSessionManager::acquire_session(Continuation * /* cont ATS_UNUSED */, sockad
if (to_return) {
Debug("http_ss", "[%" PRId64 "] [acquire session] return session from shared pool", to_return->con_id);
to_return->state = HSS_ACTIVE;
- // Holding the pool lock and the sm lock
+ // Holding the pool lock and the sm lock
// the attach_server_session will issue the do_io_read under the sm lock
- // Must be careful to transfer the lock for the read vio because
+ // Must be careful to transfer the lock for the read vio because
// the server VC may be moving between threads TS-3266
sm->attach_server_session(to_return);
retval = HSM_DONE;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b4c7852/proxy/http/HttpSessionManager.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionManager.h b/proxy/http/HttpSessionManager.h
index a95ba56..8d82756 100644
--- a/proxy/http/HttpSessionManager.h
+++ b/proxy/http/HttpSessionManager.h
@@ -132,7 +132,8 @@ public:
@return A pointer to the session or @c NULL if not matching session was found.
*/
- HSMresult_t acquireSession(sockaddr const *addr, INK_MD5 const &host_hash, TSServerSessionSharingMatchType match_style, HttpServerSession *&server_session);
+ HSMresult_t acquireSession(sockaddr const *addr, INK_MD5 const &host_hash, TSServerSessionSharingMatchType match_style,
+ HttpServerSession *&server_session);
/** Release a session to to pool.
*/
void releaseSession(HttpServerSession *ss);