You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2016/02/01 18:54:27 UTC
[01/10] trafficserver git commit: tsxs accepts .lo files as argument
for linking [Forced Update!]
Repository: trafficserver
Updated Branches:
refs/heads/ts-4160 4f1816933 -> b222439d5 (forced update)
tsxs accepts .lo files as argument for linking
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c32288de
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c32288de
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c32288de
Branch: refs/heads/ts-4160
Commit: c32288de70686437de71f2c12c34afc38e68c088
Parents: f8ce9e9
Author: Joseph Hindin <hi...@nkloom.com>
Authored: Sun Jan 31 16:55:57 2016 +0200
Committer: Joseph Hindin <hi...@nkloom.com>
Committed: Sun Jan 31 16:55:57 2016 +0200
----------------------------------------------------------------------
tools/tsxs.in | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c32288de/tools/tsxs.in
----------------------------------------------------------------------
diff --git a/tools/tsxs.in b/tools/tsxs.in
index d5de492..ad00acc 100755
--- a/tools/tsxs.in
+++ b/tools/tsxs.in
@@ -102,6 +102,10 @@ compile() {
MY_CFLAGS="$CPPFLAGS $CXXFLAGS"
MY_CC=$CXX
;;
+ lo)
+ OBJS="${OBJS} ${SRC}"
+ return
+ ;;
*)
bail "unrecognized input file: $SRC"
;;
[07/10] trafficserver git commit: [TS-4160] Reset the txn
request/response handles at each hook, since core may destroy them.
Posted by su...@apache.org.
[TS-4160] Reset the txn request/response handles at each hook, since core may destroy them.
[TS-4160] clean up the code and initialize all handles for all hooks.
[TS-4160] move the reset of handles to NULL to the operator() from TS-4135.
[TS-4160] remove unnecessary reset.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3e78810b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3e78810b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3e78810b
Branch: refs/heads/ts-4160
Commit: 3e78810b09e44f0ca814b735c543bcb9fde0ec76
Parents: af72c71
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Fri Jan 29 01:00:10 2016 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Mon Feb 1 17:33:27 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/utils_internal.cc | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3e78810b/lib/atscppapi/src/utils_internal.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/utils_internal.cc b/lib/atscppapi/src/utils_internal.cc
index ff0012e..dd7bca4 100644
--- a/lib/atscppapi/src/utils_internal.cc
+++ b/lib/atscppapi/src/utils_internal.cc
@@ -43,6 +43,18 @@ namespace
const int MAX_TXN_ARG = 15;
const int TRANSACTION_STORAGE_INDEX = MAX_TXN_ARG;
+void
+initTransactionHandles(Transaction &transaction)
+{
+ utils::internal::initTransactionCachedRequest(transaction);
+ utils::internal::initTransactionCachedResponse(transaction);
+ utils::internal::initTransactionServerRequest(transaction);
+ utils::internal::initTransactionServerResponse(transaction);
+ utils::internal::initTransactionClientResponse(transaction);
+
+ return;
+}
+
int
handleTransactionEvents(TSCont cont, TSEvent event, void *edata)
{
@@ -61,19 +73,14 @@ handleTransactionEvents(TSCont cont, TSEvent event, void *edata)
(void)TSHttpTxnClientReqGet(static_cast<TSHttpTxn>(transaction.getAtsHandle()), &hdr_buf, &hdr_loc);
break;
case TS_EVENT_HTTP_SEND_REQUEST_HDR:
- utils::internal::initTransactionServerRequest(transaction);
- break;
case TS_EVENT_HTTP_READ_RESPONSE_HDR:
- utils::internal::initTransactionServerResponse(transaction);
- break;
case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
- utils::internal::initTransactionClientResponse(transaction);
- break;
case TS_EVENT_HTTP_READ_CACHE_HDR:
- utils::internal::initTransactionCachedRequest(transaction);
- utils::internal::initTransactionCachedResponse(transaction);
+ // the buffer handles may be destroyed in the core during redirect follow
+ initTransactionHandles(transaction);
break;
case TS_EVENT_HTTP_TXN_CLOSE: { // opening scope to declare plugins variable below
+ initTransactionHandles(transaction);
const std::list<TransactionPlugin *> &plugins = utils::internal::getTransactionPlugins(transaction);
for (std::list<TransactionPlugin *>::const_iterator iter = plugins.begin(), end = plugins.end(); iter != end; ++iter) {
shared_ptr<Mutex> trans_mutex = utils::internal::getTransactionPluginMutex(**iter);
[04/10] trafficserver git commit: [TS-4135] fix redirect coredump
Posted by su...@apache.org.
[TS-4135] fix redirect coredump
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d42bad19
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d42bad19
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d42bad19
Branch: refs/heads/ts-4160
Commit: d42bad1917cf05b9cbc4a3ff5b5bbdb182a0599b
Parents: af72c71
Author: Sandeep Davu <sd...@sniffcliff.corp.ne1.yahoo.com>
Authored: Fri Jan 29 00:13:00 2016 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Mon Feb 1 17:32:26 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/Request.cc | 5 -----
lib/atscppapi/src/Transaction.cc | 34 +++++-----------------------------
2 files changed, 5 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d42bad19/lib/atscppapi/src/Request.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Request.cc b/lib/atscppapi/src/Request.cc
index 6e1166e..250f4f5 100644
--- a/lib/atscppapi/src/Request.cc
+++ b/lib/atscppapi/src/Request.cc
@@ -84,11 +84,6 @@ Request::Request(const string &url_str, HttpMethod method, HttpVersion version)
void
Request::init(void *hdr_buf, void *hdr_loc)
{
- if (state_->hdr_buf_ || state_->hdr_loc_) {
- LOG_ERROR("Reinitialization; (hdr_buf, hdr_loc) current(%p, %p), attempted(%p, %p)", state_->hdr_buf_, state_->hdr_loc_,
- hdr_buf, hdr_loc);
- return;
- }
state_->hdr_buf_ = static_cast<TSMBuffer>(hdr_buf);
state_->hdr_loc_ = static_cast<TSMLoc>(hdr_loc);
state_->headers_.reset(state_->hdr_buf_, state_->hdr_loc_);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d42bad19/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index b9396ef..8790c00 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -86,28 +86,6 @@ Transaction::Transaction(void *raw_txn)
Transaction::~Transaction()
{
LOG_DEBUG("Transaction tshttptxn=%p destroying Transaction object %p", state_->txn_, this);
- static const TSMLoc NULL_PARENT_LOC = NULL;
- TSHandleMLocRelease(state_->client_request_hdr_buf_, NULL_PARENT_LOC, state_->client_request_hdr_loc_);
- if (state_->server_request_hdr_buf_ && state_->server_request_hdr_loc_) {
- LOG_DEBUG("Releasing server request");
- TSHandleMLocRelease(state_->server_request_hdr_buf_, NULL_PARENT_LOC, state_->server_request_hdr_loc_);
- }
- if (state_->server_response_hdr_buf_ && state_->server_response_hdr_loc_) {
- LOG_DEBUG("Releasing server response");
- TSHandleMLocRelease(state_->server_response_hdr_buf_, NULL_PARENT_LOC, state_->server_response_hdr_loc_);
- }
- if (state_->client_response_hdr_buf_ && state_->client_response_hdr_loc_) {
- LOG_DEBUG("Releasing client response");
- TSHandleMLocRelease(state_->client_response_hdr_buf_, NULL_PARENT_LOC, state_->client_response_hdr_loc_);
- }
- if (state_->cached_request_hdr_buf_ && state_->cached_request_hdr_loc_) {
- LOG_DEBUG("Releasing cached request");
- TSHandleMLocRelease(state_->cached_request_hdr_buf_, NULL_PARENT_LOC, state_->cached_request_hdr_loc_);
- }
- if (state_->cached_response_hdr_buf_ && state_->cached_response_hdr_loc_) {
- LOG_DEBUG("Releasing cached response");
- TSHandleMLocRelease(state_->cached_response_hdr_buf_, NULL_PARENT_LOC, state_->cached_response_hdr_loc_);
- }
delete state_;
}
@@ -433,14 +411,12 @@ public:
initializeHandles(GetterFunction getter) : getter_(getter) {}
bool operator()(TSHttpTxn txn, TSMBuffer &hdr_buf, TSMLoc &hdr_loc, const char *handles_name)
{
- if (!hdr_buf && !hdr_loc) {
- if (getter_(txn, &hdr_buf, &hdr_loc) == TS_SUCCESS) {
- return true;
- } else {
- LOG_ERROR("Could not get %s", handles_name);
- }
+ hdr_buf = NULL;
+ hdr_loc = NULL;
+ if (getter_(txn, &hdr_buf, &hdr_loc) == TS_SUCCESS) {
+ return true;
} else {
- LOG_ERROR("%s already initialized", handles_name);
+ LOG_ERROR("Could not get %s", handles_name);
}
return false;
}
[02/10] trafficserver git commit: TS-4169: Accept .lo,
.o and .a files in tsxs.
Posted by su...@apache.org.
TS-4169: Accept .lo, .o and .a files in tsxs.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/61a391d5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/61a391d5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/61a391d5
Branch: refs/heads/ts-4160
Commit: 61a391d5f35efe0585c4954a7e8ccd450c2d36b5
Parents: c32288d
Author: Joseph Hindin <hi...@nkloom.com>
Authored: Sun Jan 31 22:33:47 2016 +0200
Committer: James Peach <jp...@apache.org>
Committed: Sun Jan 31 18:53:54 2016 -0800
----------------------------------------------------------------------
tools/tsxs.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/61a391d5/tools/tsxs.in
----------------------------------------------------------------------
diff --git a/tools/tsxs.in b/tools/tsxs.in
index ad00acc..9e5a85f 100755
--- a/tools/tsxs.in
+++ b/tools/tsxs.in
@@ -102,7 +102,7 @@ compile() {
MY_CFLAGS="$CPPFLAGS $CXXFLAGS"
MY_CC=$CXX
;;
- lo)
+ lo|o|a)
OBJS="${OBJS} ${SRC}"
return
;;
[03/10] trafficserver git commit: TS-4158: release mlocs correctly in
esi pugin. This closes #441
Posted by su...@apache.org.
TS-4158: release mlocs correctly in esi pugin. This closes #441
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/af72c715
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/af72c715
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/af72c715
Branch: refs/heads/ts-4160
Commit: af72c715e4bb510bfbe6bfe7749fd887f55e5fe7
Parents: 61a391d
Author: Kit Chan <ki...@apache.org>
Authored: Sun Jan 31 21:41:00 2016 -0800
Committer: Kit Chan <ki...@apache.org>
Committed: Sun Jan 31 21:41:00 2016 -0800
----------------------------------------------------------------------
plugins/experimental/esi/esi.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/af72c715/plugins/experimental/esi/esi.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/esi.cc b/plugins/experimental/esi/esi.cc
index cd42e62..cdf729e 100644
--- a/plugins/experimental/esi/esi.cc
+++ b/plugins/experimental/esi/esi.cc
@@ -552,7 +552,7 @@ removeCacheKey(TSHttpTxn txnp)
}
TSHandleMLocRelease(req_bufp, req_hdr_loc, url_loc);
- if (url_loc != NULL) {
+ if (req_hdr_loc != NULL) {
TSHandleMLocRelease(req_bufp, TS_NULL_MLOC, req_hdr_loc);
}
[10/10] trafficserver git commit: [TS-4160] Remove extraneous debug
Posted by su...@apache.org.
[TS-4160] Remove extraneous debug
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b222439d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b222439d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b222439d
Branch: refs/heads/ts-4160
Commit: b222439d5bb338623acf012a3eb63aedbb39839d
Parents: 4b07507
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Mon Feb 1 17:47:22 2016 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Mon Feb 1 17:47:22 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/Transaction.cc | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b222439d/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index 29ace6c..332ba58 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -479,7 +479,6 @@ Transaction::initCachedResponse(TSEvent event)
static initializeHandles initializeCachedResponseHandles(TSHttpTxnCachedRespGet);
initializeCachedResponseHandles(state_->txn_, state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
"cached response");
- LOG_DEBUG("Initializing cached response");
LOG_DEBUG("Initializing cached response, event %d", event);
state_->cached_response_.init(state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_);
}
[06/10] trafficserver git commit: [TS-4135] made reset implicit to
init for request/response
Posted by su...@apache.org.
[TS-4135] made reset implicit to init for request/response
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/39be80da
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/39be80da
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/39be80da
Branch: refs/heads/ts-4160
Commit: 39be80da3fd5eabb3e9d3531316567a6d584723f
Parents: b3e4ca5
Author: Sandeep Davu <sd...@sniffcliff.corp.ne1.yahoo.com>
Authored: Fri Jan 29 23:39:22 2016 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Mon Feb 1 17:32:27 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/Request.cc | 4 +++
lib/atscppapi/src/Response.cc | 4 +++
lib/atscppapi/src/Transaction.cc | 58 +++++++++++------------------------
3 files changed, 26 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/39be80da/lib/atscppapi/src/Request.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Request.cc b/lib/atscppapi/src/Request.cc
index 714ac93..5eea763 100644
--- a/lib/atscppapi/src/Request.cc
+++ b/lib/atscppapi/src/Request.cc
@@ -84,6 +84,10 @@ Request::Request(const string &url_str, HttpMethod method, HttpVersion version)
void
Request::init(void *hdr_buf, void *hdr_loc)
{
+ reset();
+ if (!hdr_buf || !hdr_loc) {
+ return;
+ }
state_->hdr_buf_ = static_cast<TSMBuffer>(hdr_buf);
state_->hdr_loc_ = static_cast<TSMLoc>(hdr_loc);
state_->headers_.reset(state_->hdr_buf_, state_->hdr_loc_);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/39be80da/lib/atscppapi/src/Response.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Response.cc b/lib/atscppapi/src/Response.cc
index 823986f..50da522 100644
--- a/lib/atscppapi/src/Response.cc
+++ b/lib/atscppapi/src/Response.cc
@@ -48,6 +48,10 @@ Response::Response()
void
Response::init(void *hdr_buf, void *hdr_loc)
{
+ reset();
+ if (!hdr_buf || !hdr_loc) {
+ return;
+ }
state_->hdr_buf_ = static_cast<TSMBuffer>(hdr_buf);
state_->hdr_loc_ = static_cast<TSMLoc>(hdr_loc);
state_->headers_.reset(state_->hdr_buf_, state_->hdr_loc_);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/39be80da/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index 3f1b0a8..1f7cd22 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -431,68 +431,46 @@ void
Transaction::initServerRequest()
{
static initializeHandles initializeServerRequestHandles(TSHttpTxnServerReqGet);
- if (initializeServerRequestHandles(state_->txn_, state_->server_request_hdr_buf_, state_->server_request_hdr_loc_,
- "server request")) {
- LOG_DEBUG("Initializing server request");
- state_->server_request_.init(state_->server_request_hdr_buf_, state_->server_request_hdr_loc_);
- } else {
- LOG_DEBUG("Reset server request");
- state_->server_request_.reset();
- }
+ initializeServerRequestHandles(state_->txn_, state_->server_request_hdr_buf_, state_->server_request_hdr_loc_, "server request");
+ LOG_DEBUG("Initializing server request");
+ state_->server_request_.init(state_->server_request_hdr_buf_, state_->server_request_hdr_loc_);
}
void
Transaction::initServerResponse()
{
static initializeHandles initializeServerResponseHandles(TSHttpTxnServerRespGet);
- if (initializeServerResponseHandles(state_->txn_, state_->server_response_hdr_buf_, state_->server_response_hdr_loc_,
- "server response")) {
- LOG_DEBUG("Initializing server response");
- state_->server_response_.init(state_->server_response_hdr_buf_, state_->server_response_hdr_loc_);
- } else {
- LOG_DEBUG("Reset server response");
- state_->server_response_.reset();
- }
+ initializeServerResponseHandles(state_->txn_, state_->server_response_hdr_buf_, state_->server_response_hdr_loc_,
+ "server response");
+ LOG_DEBUG("Initializing server response");
+ state_->server_response_.init(state_->server_response_hdr_buf_, state_->server_response_hdr_loc_);
}
void
Transaction::initClientResponse()
{
static initializeHandles initializeClientResponseHandles(TSHttpTxnClientRespGet);
- if (initializeClientResponseHandles(state_->txn_, state_->client_response_hdr_buf_, state_->client_response_hdr_loc_,
- "client response")) {
- LOG_DEBUG("Initializing client response");
- state_->client_response_.init(state_->client_response_hdr_buf_, state_->client_response_hdr_loc_);
- } else {
- LOG_DEBUG("Reset client response");
- state_->client_response_.reset();
- }
+ initializeClientResponseHandles(state_->txn_, state_->client_response_hdr_buf_, state_->client_response_hdr_loc_,
+ "client response");
+ LOG_DEBUG("Initializing client response");
+ state_->client_response_.init(state_->client_response_hdr_buf_, state_->client_response_hdr_loc_);
}
void
Transaction::initCachedRequest()
{
static initializeHandles initializeCachedRequestHandles(TSHttpTxnCachedReqGet);
- if (initializeCachedRequestHandles(state_->txn_, state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_,
- "cached request")) {
- LOG_DEBUG("Initializing cached request");
- state_->cached_request_.init(state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_);
- } else {
- LOG_DEBUG("Reset cached request");
- state_->cached_request_.reset();
- }
+ initializeCachedRequestHandles(state_->txn_, state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_, "cached request");
+ LOG_DEBUG("Initializing cached request");
+ state_->cached_request_.init(state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_);
}
void
Transaction::initCachedResponse()
{
static initializeHandles initializeCachedResponseHandles(TSHttpTxnCachedRespGet);
- if (initializeCachedResponseHandles(state_->txn_, state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
- "cached response")) {
- LOG_DEBUG("Initializing cached response");
- state_->cached_response_.init(state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_);
- } else {
- LOG_DEBUG("Reset cached response");
- state_->cached_response_.reset();
- }
+ initializeCachedResponseHandles(state_->txn_, state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
+ "cached response");
+ LOG_DEBUG("Initializing cached response");
+ state_->cached_response_.init(state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_);
}
[05/10] trafficserver git commit: [TS-4135] reset handles to null if
getter fails
Posted by su...@apache.org.
[TS-4135] reset handles to null if getter fails
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b3e4ca5b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b3e4ca5b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b3e4ca5b
Branch: refs/heads/ts-4160
Commit: b3e4ca5b2ef5fe160a533945389ceb546461b327
Parents: d42bad1
Author: Sandeep Davu <sd...@sniffcliff.corp.ne1.yahoo.com>
Authored: Fri Jan 29 20:48:02 2016 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Mon Feb 1 17:32:26 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/Request.cc | 10 ++++++++++
lib/atscppapi/src/Response.cc | 9 +++++++++
lib/atscppapi/src/Transaction.cc | 15 +++++++++++++++
lib/atscppapi/src/include/atscppapi/Request.h | 1 +
lib/atscppapi/src/include/atscppapi/Response.h | 1 +
5 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3e4ca5b/lib/atscppapi/src/Request.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Request.cc b/lib/atscppapi/src/Request.cc
index 250f4f5..714ac93 100644
--- a/lib/atscppapi/src/Request.cc
+++ b/lib/atscppapi/src/Request.cc
@@ -97,6 +97,16 @@ Request::init(void *hdr_buf, void *hdr_loc)
}
}
+void
+Request::reset()
+{
+ state_->hdr_buf_ = NULL;
+ state_->hdr_loc_ = NULL;
+ state_->headers_.reset(NULL, NULL);
+ state_->url_loc_ = NULL;
+ LOG_DEBUG("Reset request %p", this);
+}
+
HttpMethod
Request::getMethod() const
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3e4ca5b/lib/atscppapi/src/Response.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Response.cc b/lib/atscppapi/src/Response.cc
index b60d4f1..823986f 100644
--- a/lib/atscppapi/src/Response.cc
+++ b/lib/atscppapi/src/Response.cc
@@ -54,6 +54,15 @@ Response::init(void *hdr_buf, void *hdr_loc)
LOG_DEBUG("Initializing response %p with hdr_buf=%p and hdr_loc=%p", this, state_->hdr_buf_, state_->hdr_loc_);
}
+void
+Response::reset()
+{
+ state_->hdr_buf_ = NULL;
+ state_->hdr_loc_ = NULL;
+ state_->headers_.reset(NULL, NULL);
+ LOG_DEBUG("Reset response %p", this);
+}
+
HttpVersion
Response::getVersion() const
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3e4ca5b/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index 8790c00..3f1b0a8 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -435,6 +435,9 @@ Transaction::initServerRequest()
"server request")) {
LOG_DEBUG("Initializing server request");
state_->server_request_.init(state_->server_request_hdr_buf_, state_->server_request_hdr_loc_);
+ } else {
+ LOG_DEBUG("Reset server request");
+ state_->server_request_.reset();
}
}
@@ -446,6 +449,9 @@ Transaction::initServerResponse()
"server response")) {
LOG_DEBUG("Initializing server response");
state_->server_response_.init(state_->server_response_hdr_buf_, state_->server_response_hdr_loc_);
+ } else {
+ LOG_DEBUG("Reset server response");
+ state_->server_response_.reset();
}
}
@@ -457,6 +463,9 @@ Transaction::initClientResponse()
"client response")) {
LOG_DEBUG("Initializing client response");
state_->client_response_.init(state_->client_response_hdr_buf_, state_->client_response_hdr_loc_);
+ } else {
+ LOG_DEBUG("Reset client response");
+ state_->client_response_.reset();
}
}
@@ -468,6 +477,9 @@ Transaction::initCachedRequest()
"cached request")) {
LOG_DEBUG("Initializing cached request");
state_->cached_request_.init(state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_);
+ } else {
+ LOG_DEBUG("Reset cached request");
+ state_->cached_request_.reset();
}
}
@@ -479,5 +491,8 @@ Transaction::initCachedResponse()
"cached response")) {
LOG_DEBUG("Initializing cached response");
state_->cached_response_.init(state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_);
+ } else {
+ LOG_DEBUG("Reset cached response");
+ state_->cached_response_.reset();
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3e4ca5b/lib/atscppapi/src/include/atscppapi/Request.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/Request.h b/lib/atscppapi/src/include/atscppapi/Request.h
index bfe1b0a..25ab332 100644
--- a/lib/atscppapi/src/include/atscppapi/Request.h
+++ b/lib/atscppapi/src/include/atscppapi/Request.h
@@ -65,6 +65,7 @@ private:
Request(void *hdr_buf, void *hdr_loc);
RequestState *state_;
void init(void *hdr_buf, void *hdr_loc);
+ void reset();
friend class Transaction;
friend class ClientRequest;
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3e4ca5b/lib/atscppapi/src/include/atscppapi/Response.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/Response.h b/lib/atscppapi/src/include/atscppapi/Response.h
index 5b8582d..741d709 100644
--- a/lib/atscppapi/src/include/atscppapi/Response.h
+++ b/lib/atscppapi/src/include/atscppapi/Response.h
@@ -67,6 +67,7 @@ public:
private:
ResponseState *state_;
void init(void *hdr_buf, void *hdr_loc);
+ void reset();
friend class Transaction;
friend class utils::internal;
};
[09/10] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver into ts-4160
Posted by su...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver into ts-4160
Conflicts:
lib/atscppapi/src/Transaction.cc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4b07507b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4b07507b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4b07507b
Branch: refs/heads/ts-4160
Commit: 4b07507b29d22e65cc0487d430fcdc9f894255fd
Parents: d5c674c 39be80d
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Mon Feb 1 17:45:17 2016 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Mon Feb 1 17:45:17 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/Request.cc | 15 +++-
lib/atscppapi/src/Response.cc | 13 ++++
lib/atscppapi/src/Transaction.cc | 78 +++++++--------------
lib/atscppapi/src/include/atscppapi/Request.h | 1 +
lib/atscppapi/src/include/atscppapi/Response.h | 1 +
5 files changed, 51 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4b07507b/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --cc lib/atscppapi/src/Transaction.cc
index 8828c42,1f7cd22..29ace6c
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@@ -452,64 -428,49 +428,58 @@@ private
} // anonymous namespace
void
-Transaction::initServerRequest()
+Transaction::initServerRequest(TSEvent event)
{
static initializeHandles initializeServerRequestHandles(TSHttpTxnServerReqGet);
- if (initializeServerRequestHandles(state_->txn_, state_->server_request_hdr_buf_, state_->server_request_hdr_loc_,
- "server request")) {
- LOG_DEBUG("Initializing server request, event %d", event);
- state_->server_request_.init(state_->server_request_hdr_buf_, state_->server_request_hdr_loc_);
- }
+ initializeServerRequestHandles(state_->txn_, state_->server_request_hdr_buf_, state_->server_request_hdr_loc_, "server request");
- LOG_DEBUG("Initializing server request");
++ LOG_DEBUG("Initializing server request, event %d", event);
+ state_->server_request_.init(state_->server_request_hdr_buf_, state_->server_request_hdr_loc_);
}
void
-Transaction::initServerResponse()
+Transaction::initServerResponse(TSEvent event)
{
static initializeHandles initializeServerResponseHandles(TSHttpTxnServerRespGet);
- if (initializeServerResponseHandles(state_->txn_, state_->server_response_hdr_buf_, state_->server_response_hdr_loc_,
- "server response")) {
- LOG_DEBUG("Initializing server response, event %d", event);
- state_->server_response_.init(state_->server_response_hdr_buf_, state_->server_response_hdr_loc_);
- }
+ initializeServerResponseHandles(state_->txn_, state_->server_response_hdr_buf_, state_->server_response_hdr_loc_,
+ "server response");
- LOG_DEBUG("Initializing server response");
++ LOG_DEBUG("Initializing server response, event %d", event);
+ state_->server_response_.init(state_->server_response_hdr_buf_, state_->server_response_hdr_loc_);
}
void
-Transaction::initClientResponse()
+Transaction::initClientResponse(TSEvent event)
{
static initializeHandles initializeClientResponseHandles(TSHttpTxnClientRespGet);
- if (initializeClientResponseHandles(state_->txn_, state_->client_response_hdr_buf_, state_->client_response_hdr_loc_,
- "client response")) {
- LOG_DEBUG("Initializing client response, event %d", event);
- state_->client_response_.init(state_->client_response_hdr_buf_, state_->client_response_hdr_loc_);
- }
+ initializeClientResponseHandles(state_->txn_, state_->client_response_hdr_buf_, state_->client_response_hdr_loc_,
+ "client response");
- LOG_DEBUG("Initializing client response");
++ LOG_DEBUG("Initializing client response, event %d", event);
+ state_->client_response_.init(state_->client_response_hdr_buf_, state_->client_response_hdr_loc_);
}
void
-Transaction::initCachedRequest()
+Transaction::initCachedRequest(TSEvent event)
{
static initializeHandles initializeCachedRequestHandles(TSHttpTxnCachedReqGet);
+
+ if (event == TS_EVENT_HTTP_TXN_CLOSE) {
+ // CachedRequest is destroyed in tunnel_handler_cache_read
+ state_->cached_request_.reset();
+ LOG_DEBUG("Reset cached request, event %d", event);
+ return;
+ }
+
- if (initializeCachedRequestHandles(state_->txn_, state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_,
- "cached request")) {
- LOG_DEBUG("Initializing cached request, event %d", event);
- state_->cached_request_.init(state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_);
- }
+ initializeCachedRequestHandles(state_->txn_, state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_, "cached request");
- LOG_DEBUG("Initializing cached request");
++ LOG_DEBUG("Initializing cached request, event %d", event);
+ state_->cached_request_.init(state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_);
}
void
-Transaction::initCachedResponse()
+Transaction::initCachedResponse(TSEvent event)
{
static initializeHandles initializeCachedResponseHandles(TSHttpTxnCachedRespGet);
- if (initializeCachedResponseHandles(state_->txn_, state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
- "cached response")) {
- LOG_DEBUG("Initializing cached response, event %d", event);
- state_->cached_response_.init(state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_);
- }
+ initializeCachedResponseHandles(state_->txn_, state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
+ "cached response");
+ LOG_DEBUG("Initializing cached response");
++ LOG_DEBUG("Initializing cached response, event %d", event);
+ state_->cached_response_.init(state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_);
}
[08/10] trafficserver git commit: [TS-4160] Add more diagnostic info
to init handles.
Posted by su...@apache.org.
[TS-4160] Add more diagnostic info to init handles.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d5c674c3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d5c674c3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d5c674c3
Branch: refs/heads/ts-4160
Commit: d5c674c3c756c28ea98275f611796eddfc4debbb
Parents: 3e78810
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Mon Feb 1 17:32:55 2016 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Mon Feb 1 17:33:28 2016 +0000
----------------------------------------------------------------------
lib/atscppapi/src/Transaction.cc | 28 +++++++++++++-------
.../src/include/atscppapi/Transaction.h | 10 +++----
lib/atscppapi/src/include/utils_internal.h | 20 +++++++-------
lib/atscppapi/src/utils_internal.cc | 16 +++++------
4 files changed, 41 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5c674c3/lib/atscppapi/src/Transaction.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index b9396ef..8828c42 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -452,56 +452,64 @@ private:
} // anonymous namespace
void
-Transaction::initServerRequest()
+Transaction::initServerRequest(TSEvent event)
{
static initializeHandles initializeServerRequestHandles(TSHttpTxnServerReqGet);
if (initializeServerRequestHandles(state_->txn_, state_->server_request_hdr_buf_, state_->server_request_hdr_loc_,
"server request")) {
- LOG_DEBUG("Initializing server request");
+ LOG_DEBUG("Initializing server request, event %d", event);
state_->server_request_.init(state_->server_request_hdr_buf_, state_->server_request_hdr_loc_);
}
}
void
-Transaction::initServerResponse()
+Transaction::initServerResponse(TSEvent event)
{
static initializeHandles initializeServerResponseHandles(TSHttpTxnServerRespGet);
if (initializeServerResponseHandles(state_->txn_, state_->server_response_hdr_buf_, state_->server_response_hdr_loc_,
"server response")) {
- LOG_DEBUG("Initializing server response");
+ LOG_DEBUG("Initializing server response, event %d", event);
state_->server_response_.init(state_->server_response_hdr_buf_, state_->server_response_hdr_loc_);
}
}
void
-Transaction::initClientResponse()
+Transaction::initClientResponse(TSEvent event)
{
static initializeHandles initializeClientResponseHandles(TSHttpTxnClientRespGet);
if (initializeClientResponseHandles(state_->txn_, state_->client_response_hdr_buf_, state_->client_response_hdr_loc_,
"client response")) {
- LOG_DEBUG("Initializing client response");
+ LOG_DEBUG("Initializing client response, event %d", event);
state_->client_response_.init(state_->client_response_hdr_buf_, state_->client_response_hdr_loc_);
}
}
void
-Transaction::initCachedRequest()
+Transaction::initCachedRequest(TSEvent event)
{
static initializeHandles initializeCachedRequestHandles(TSHttpTxnCachedReqGet);
+
+ if (event == TS_EVENT_HTTP_TXN_CLOSE) {
+ // CachedRequest is destroyed in tunnel_handler_cache_read
+ state_->cached_request_.reset();
+ LOG_DEBUG("Reset cached request, event %d", event);
+ return;
+ }
+
if (initializeCachedRequestHandles(state_->txn_, state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_,
"cached request")) {
- LOG_DEBUG("Initializing cached request");
+ LOG_DEBUG("Initializing cached request, event %d", event);
state_->cached_request_.init(state_->cached_request_hdr_buf_, state_->cached_request_hdr_loc_);
}
}
void
-Transaction::initCachedResponse()
+Transaction::initCachedResponse(TSEvent event)
{
static initializeHandles initializeCachedResponseHandles(TSHttpTxnCachedRespGet);
if (initializeCachedResponseHandles(state_->txn_, state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_,
"cached response")) {
- LOG_DEBUG("Initializing cached response");
+ LOG_DEBUG("Initializing cached response, event %d", event);
state_->cached_response_.init(state_->cached_response_hdr_buf_, state_->cached_response_hdr_loc_);
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5c674c3/lib/atscppapi/src/include/atscppapi/Transaction.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/Transaction.h b/lib/atscppapi/src/include/atscppapi/Transaction.h
index 02b3397..42b980d 100644
--- a/lib/atscppapi/src/include/atscppapi/Transaction.h
+++ b/lib/atscppapi/src/include/atscppapi/Transaction.h
@@ -367,21 +367,21 @@ private:
*
* @private
*/
- void initServerRequest();
+ void initServerRequest(TSEvent event);
/**
* Used to initialize the Response object for the Server.
*
* @private
*/
- void initServerResponse();
+ void initServerResponse(TSEvent event);
/**
* Used to initialize the Response object for the Client.
*
* @private
*/
- void initClientResponse();
+ void initClientResponse(TSEvent event);
/**
* Used to initialize the Request object for the cache.
@@ -389,7 +389,7 @@ private:
* @private
*/
- void initCachedRequest();
+ void initCachedRequest(TSEvent event);
/**
* Used to initialize the Response object for the cache.
@@ -397,7 +397,7 @@ private:
* @private
*/
- void initCachedResponse();
+ void initCachedResponse(TSEvent event);
/**
* Returns a list of TransactionPlugin pointers bound to the current Transaction
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5c674c3/lib/atscppapi/src/include/utils_internal.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/utils_internal.h b/lib/atscppapi/src/include/utils_internal.h
index e9dc504..e4b0c68 100644
--- a/lib/atscppapi/src/include/utils_internal.h
+++ b/lib/atscppapi/src/include/utils_internal.h
@@ -72,33 +72,33 @@ namespace utils
}
static void
- initTransactionServerRequest(Transaction &transaction)
+ initTransactionServerRequest(Transaction &transaction, TSEvent event)
{
- transaction.initServerRequest();
+ transaction.initServerRequest(event);
}
static void
- initTransactionServerResponse(Transaction &transaction)
+ initTransactionServerResponse(Transaction &transaction, TSEvent event)
{
- transaction.initServerResponse();
+ transaction.initServerResponse(event);
}
static void
- initTransactionClientResponse(Transaction &transaction)
+ initTransactionClientResponse(Transaction &transaction, TSEvent event)
{
- transaction.initClientResponse();
+ transaction.initClientResponse(event);
}
static void
- initTransactionCachedRequest(Transaction &transaction)
+ initTransactionCachedRequest(Transaction &transaction, TSEvent event)
{
- transaction.initCachedRequest();
+ transaction.initCachedRequest(event);
}
static void
- initTransactionCachedResponse(Transaction &transaction)
+ initTransactionCachedResponse(Transaction &transaction, TSEvent event)
{
- transaction.initCachedResponse();
+ transaction.initCachedResponse(event);
}
static const std::list<TransactionPlugin *> &
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d5c674c3/lib/atscppapi/src/utils_internal.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/utils_internal.cc b/lib/atscppapi/src/utils_internal.cc
index dd7bca4..82a5065 100644
--- a/lib/atscppapi/src/utils_internal.cc
+++ b/lib/atscppapi/src/utils_internal.cc
@@ -44,13 +44,13 @@ const int MAX_TXN_ARG = 15;
const int TRANSACTION_STORAGE_INDEX = MAX_TXN_ARG;
void
-initTransactionHandles(Transaction &transaction)
+initTransactionHandles(Transaction &transaction, TSEvent event)
{
- utils::internal::initTransactionCachedRequest(transaction);
- utils::internal::initTransactionCachedResponse(transaction);
- utils::internal::initTransactionServerRequest(transaction);
- utils::internal::initTransactionServerResponse(transaction);
- utils::internal::initTransactionClientResponse(transaction);
+ utils::internal::initTransactionCachedRequest(transaction, event);
+ utils::internal::initTransactionCachedResponse(transaction, event);
+ utils::internal::initTransactionServerRequest(transaction, event);
+ utils::internal::initTransactionServerResponse(transaction, event);
+ utils::internal::initTransactionClientResponse(transaction, event);
return;
}
@@ -77,10 +77,10 @@ handleTransactionEvents(TSCont cont, TSEvent event, void *edata)
case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
case TS_EVENT_HTTP_READ_CACHE_HDR:
// the buffer handles may be destroyed in the core during redirect follow
- initTransactionHandles(transaction);
+ initTransactionHandles(transaction, event);
break;
case TS_EVENT_HTTP_TXN_CLOSE: { // opening scope to declare plugins variable below
- initTransactionHandles(transaction);
+ initTransactionHandles(transaction, event);
const std::list<TransactionPlugin *> &plugins = utils::internal::getTransactionPlugins(transaction);
for (std::list<TransactionPlugin *>::const_iterator iter = plugins.begin(), end = plugins.end(); iter != end; ++iter) {
shared_ptr<Mutex> trans_mutex = utils::internal::getTransactionPluginMutex(**iter);