You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2014/05/21 23:09:24 UTC
git commit: TS-2824: Revert TS-2592 (2fbd4b6)
Repository: trafficserver
Updated Branches:
refs/heads/master ea0a9b1b7 -> 9a435de7e
TS-2824: Revert TS-2592 (2fbd4b6)
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9a435de7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9a435de7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9a435de7
Branch: refs/heads/master
Commit: 9a435de7e1bd400d5b4f333514a73004427cdc9c
Parents: ea0a9b1
Author: Phil Sorber <so...@apache.org>
Authored: Wed May 21 15:08:24 2014 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Wed May 21 15:08:24 2014 -0600
----------------------------------------------------------------------
CHANGES | 4 ++--
iocore/eventsystem/P_IOBuffer.h | 10 +++++-----
proxy/http/HttpTransact.cc | 2 +-
proxy/http/HttpTransact.h | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a435de7/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 74934aa..85b20e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2824] Revert TS-2592.
+
*) [TS-2632] Do not lock the object in cache (by default) on Range
requests. This adds proxy.config.http.cache.range.write.
@@ -321,8 +323,6 @@ Changes with Apache Traffic Server 5.0.0
*) [TS-2593] HTTPS to origin fails on CentOS6.x. This is a regression of
sort from TS-2355.
- *) [TS-2592] Use proxy allocator for ioBufAllocator
-
*) [TS-2576] Add Oct/Hex escape representation into LogFormat
*) [TS-2494] fix the crash that return the stale cached document
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a435de7/iocore/eventsystem/P_IOBuffer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index c82cd33..20e1405 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -290,7 +290,7 @@ IOBufferData::alloc(int64_t size_index, AllocType type)
switch (type) {
case MEMALIGNED:
if (BUFFER_SIZE_INDEX_IS_FAST_ALLOCATED(size_index))
- _data = (char *) THREAD_ALLOC(ioBufAllocator[size_index], this_thread());
+ _data = (char *) ioBufAllocator[size_index].alloc_void();
// coverity[dead_error_condition]
else if (BUFFER_SIZE_INDEX_IS_XMALLOCED(size_index))
_data = (char *)ats_memalign(ats_pagesize(), index_to_buffer_size(size_index));
@@ -298,7 +298,7 @@ IOBufferData::alloc(int64_t size_index, AllocType type)
default:
case DEFAULT_ALLOC:
if (BUFFER_SIZE_INDEX_IS_FAST_ALLOCATED(size_index))
- _data = (char *) THREAD_ALLOC(ioBufAllocator[size_index], this_thread());
+ _data = (char *) ioBufAllocator[size_index].alloc_void();
else if (BUFFER_SIZE_INDEX_IS_XMALLOCED(size_index))
_data = (char *)ats_malloc(BUFFER_SIZE_FOR_XMALLOC(size_index));
break;
@@ -317,14 +317,14 @@ IOBufferData::dealloc()
switch (_mem_type) {
case MEMALIGNED:
if (BUFFER_SIZE_INDEX_IS_FAST_ALLOCATED(_size_index))
- THREAD_FREE(_data, ioBufAllocator[_size_index], this_thread());
+ ioBufAllocator[_size_index].free_void(_data);
else if (BUFFER_SIZE_INDEX_IS_XMALLOCED(_size_index))
::free((void *) _data);
break;
default:
case DEFAULT_ALLOC:
if (BUFFER_SIZE_INDEX_IS_FAST_ALLOCATED(_size_index))
- THREAD_FREE(_data, ioBufAllocator[_size_index], this_thread());
+ ioBufAllocator[_size_index].free_void(_data);
else if (BUFFER_SIZE_INDEX_IS_XMALLOCED(_size_index))
ats_free(_data);
break;
@@ -536,7 +536,7 @@ IOBufferBlock::realloc(int64_t i)
return;
ink_release_assert(i > data->_size_index && i != BUFFER_SIZE_NOT_ALLOCATED);
- void *b = THREAD_ALLOC(ioBufAllocator[i], this_thread());
+ void *b = ioBufAllocator[i].alloc_void();
realloc_set_internal(b, BUFFER_SIZE_FOR_INDEX(i), i);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a435de7/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 3dd9432..db3aae0 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -5548,7 +5548,7 @@ HttpTransact::handle_trace_and_options_requests(State* s, HTTPHdr* incoming_hdr)
if (s->internal_msg_buffer_size <= max_iobuffer_size) {
s->internal_msg_buffer_fast_allocator_size = buffer_size_to_index(s->internal_msg_buffer_size);
- s->internal_msg_buffer = (char *) THREAD_ALLOC(ioBufAllocator[s->internal_msg_buffer_fast_allocator_size], this_thread());
+ s->internal_msg_buffer = (char *) ioBufAllocator[s->internal_msg_buffer_fast_allocator_size].alloc_void();
} else {
s->internal_msg_buffer_fast_allocator_size = -1;
s->internal_msg_buffer = (char *)ats_malloc(s->internal_msg_buffer_size);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a435de7/proxy/http/HttpTransact.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 652c5ac..fdbd9a6 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -1215,7 +1215,7 @@ public:
{
if (internal_msg_buffer) {
if (internal_msg_buffer_fast_allocator_size >= 0) {
- THREAD_FREE(internal_msg_buffer, ioBufAllocator[internal_msg_buffer_fast_allocator_size], this_thread());
+ ioBufAllocator[internal_msg_buffer_fast_allocator_size].free_void(internal_msg_buffer);
} else {
ats_free(internal_msg_buffer);
}