trafficserver git commit: TS-4016: atscppapi Add the ability to skip the remap phase of the SM

[briang]

Repository: trafficserver
Updated Branches:
  refs/heads/master e5fed4006 -> 906d45ac0


TS-4016: atscppapi Add the ability to skip the remap phase of the SM


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/906d45ac
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/906d45ac
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/906d45ac

Branch: refs/heads/master
Commit: 906d45ac0715c6f1e9c931ca476e9875234cfc41
Parents: e5fed40
Author: Boaz Reicher 
Authored: Thu Nov 12 04:48:47 2015 -0800
Committer: Brian Geffon 
Committed: Thu Nov 12 04:48:47 2015 -0800

--
 lib/atscppapi/src/Transaction.cc  | 6 ++
 lib/atscppapi/src/include/atscppapi/Transaction.h | 6 ++
 2 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/906d45ac/lib/atscppapi/src/Transaction.cc
--
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index 30b2806..b9396ef 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -288,6 +288,12 @@ Transaction::setCacheUrl(const string _url)
   return (res == TS_SUCCESS);
 }
 
+void
+Transaction::setSkipRemapping(int flag)
+{
+  TSSkipRemappingSet(state_->txn_, flag);
+}
+
 const sockaddr *
 Transaction::getIncomingAddress() const
 {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/906d45ac/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 805807b..02b3397 100644
--- a/lib/atscppapi/src/include/atscppapi/Transaction.h
+++ b/lib/atscppapi/src/include/atscppapi/Transaction.h
@@ -251,6 +251,12 @@ public:
   bool setCacheUrl(const std::string &);
 
   /**
+   * Ability to skip the remap phase of the State Machine
+   * This only really makes sense in TS_HTTP_READ_REQUEST_HDR_HOOK
+   */
+  void setSkipRemapping(int);
+
+  /**
* The available types of timeouts you can set on a Transaction.
*/
   enum TimeoutType {

trafficserver git commit: Remove more unnecessary TS_HAS_128BIT_CAS ifdeffery.

[jpeach]

Repository: trafficserver
Updated Branches:
  refs/heads/master 906d45ac0 -> e2967b5b9


Remove more unnecessary TS_HAS_128BIT_CAS ifdeffery.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e2967b5b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e2967b5b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e2967b5b

Branch: refs/heads/master
Commit: e2967b5b9efb94d8caec85b4c949177a6e09b48c
Parents: 906d45a
Author: James Peach 
Authored: Thu Nov 12 08:40:37 2015 -0800
Committer: James Peach 
Committed: Thu Nov 12 08:40:37 2015 -0800

--
 proxy/logging/LogObject.cc | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e2967b5b/proxy/logging/LogObject.cc
--
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index bb67a25..dd272b6 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -393,11 +393,7 @@ LogObject::_checkout_write(size_t *write_offset, size_t 
bytes_needed)
   INK_QUEUE_LD(h, m_log_buffer);
   head_p new_h;
   SET_FREELIST_POINTER_VERSION(new_h, FREELIST_POINTER(h), 
FREELIST_VERSION(h) + 1);
-#if TS_HAS_128BIT_CAS
-  result = ink_atomic_cas((__int128_t *)_log_buffer.data, h.data, 
new_h.data);
-#else
-  result = ink_atomic_cas((int64_t *)_log_buffer.data, h.data, 
new_h.data);
-#endif
+  result = ink_atomic_cas(_log_buffer.data, h.data, new_h.data);
 } while (!result);
 buffer = (LogBuffer *)FREELIST_POINTER(h);
 result_code = buffer->checkout_write(write_offset, bytes_needed);
@@ -430,11 +426,7 @@ LogObject::_checkout_write(size_t *write_offset, size_t 
bytes_needed)
 }
 head_p tmp_h;
 SET_FREELIST_POINTER_VERSION(tmp_h, new_buffer, 0);
-#if TS_HAS_128BIT_CAS
-result = ink_atomic_cas((__int128_t *)_log_buffer.data, old_h.data, 
tmp_h.data);
-#else
-result = ink_atomic_cas((int64_t *)_log_buffer.data, old_h.data, 
tmp_h.data);
-#endif
+result = ink_atomic_cas(_log_buffer.data, old_h.data, tmp_h.data);
   } while (!result);
   if (FREELIST_POINTER(old_h) == FREELIST_POINTER(h)) {
 ink_atomic_increment(>m_references, FREELIST_VERSION(old_h) - 
1);
@@ -472,11 +464,7 @@ LogObject::_checkout_write(size_t *write_offset, size_t 
bytes_needed)
   break;
 head_p tmp_h;
 SET_FREELIST_POINTER_VERSION(tmp_h, FREELIST_POINTER(h), 
FREELIST_VERSION(old_h) - 1);
-#if TS_HAS_128BIT_CAS
-result = ink_atomic_cas((__int128_t *)_log_buffer.data, old_h.data, 
tmp_h.data);
-#else
-result = ink_atomic_cas((int64_t *)_log_buffer.data, old_h.data, 
tmp_h.data);
-#endif
+result = ink_atomic_cas(_log_buffer.data, old_h.data, tmp_h.data);
   } while (!result);
   if (FREELIST_POINTER(old_h) != FREELIST_POINTER(h))
 ink_atomic_increment(>m_references, -1);