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:32 UTC
[06/10] trafficserver git commit: [TS-4135] made reset implicit to
init for request/response
[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_);
}