You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/11/11 20:43:00 UTC
[1/5] trafficserver git commit: TS-3178: Updating Docs
Repository: trafficserver
Updated Branches:
refs/heads/master da06e0bc7 -> 8af788569
TS-3178: Updating Docs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b452c599
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b452c599
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b452c599
Branch: refs/heads/master
Commit: b452c599e5d38c93557e495189972f80e80a1dc8
Parents: b71a24e
Author: Brian Geffon <br...@apache.org>
Authored: Tue Nov 11 11:25:33 2014 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Nov 11 11:25:33 2014 -0800
----------------------------------------------------------------------
doc/reference/configuration/records.config.en.rst | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b452c599/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 3560b7f..41395aa 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2513,6 +2513,16 @@ Sockets
Specifies the number of task threads to run. These threads are used for
various tasks that should be off-loaded from the normal network threads.
+.. ts:cv:: CONFIG proxy.config.allocator.thread_freelist_high_watermark INT 512
+
+ Sets the maximum number of elements that can be contained in a ProxyAllocator (per-thread)
+ before returning the objects to the global pool
+
+.. ts:cv:: CONFIG proxy.config.allocator.thread_freelist_low_watermark INT 256
+
+ Sets the minimum number of items a ProxyAllocator (per-thread) will guarantee to be
+ holding at any one time.
+
.. ts:cv:: CONFIG proxy.config.http.enabled INT 1
Turn on or off support for HTTP proxying. This is rarely used, the one
[5/5] trafficserver git commit: TS-3178: Fixing build warnings
Posted by br...@apache.org.
TS-3178: Fixing build warnings
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8af78856
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8af78856
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8af78856
Branch: refs/heads/master
Commit: 8af78856965354e9d660ea88604b3ad6a31d1e70
Parents: b4a9aeb
Author: Brian Geffon <br...@apache.org>
Authored: Tue Nov 11 11:42:49 2014 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Nov 11 11:42:49 2014 -0800
----------------------------------------------------------------------
iocore/eventsystem/I_ProxyAllocator.h | 10 ++++++----
iocore/eventsystem/ProxyAllocator.cc | 10 ++++++----
mgmt/RecordsConfig.cc | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8af78856/iocore/eventsystem/I_ProxyAllocator.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_ProxyAllocator.h b/iocore/eventsystem/I_ProxyAllocator.h
index 59e2d91..c47a074 100644
--- a/iocore/eventsystem/I_ProxyAllocator.h
+++ b/iocore/eventsystem/I_ProxyAllocator.h
@@ -93,21 +93,23 @@ thread_free(Allocator &a, void *p)
template<class C> inline void
thread_freeup(ClassAllocator<C> &a, ProxyAllocator & l)
{
+#if !TS_USE_RECLAIMABLE_FREELIST
C *head = (C *) l.freelist;
+#endif
C *tail = (C *) l.freelist;
size_t count = 0;
- while(l.freelist && l.allocated > thread_freelist_low_watermark){
+ while(l.freelist && l.allocated > thread_freelist_low_watermark) {
tail = (C *) l.freelist;
l.freelist = *(C **) l.freelist;
--(l.allocated);
++count;
-#ifdef TS_USE_RECLAIMABLE_FREELIST
+#if TS_USE_RECLAIMABLE_FREELIST
a.free(tail);
#endif
}
-#if !defined(TS_USE_RECLAIMABLE_FREELIST)
+#if !TS_USE_RECLAIMABLE_FREELIST
if (unlikely(count == 1)) {
- a.free(head);
+ a.free(tail);
} else if (count > 0) {
a.free_bulk(head, tail, count);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8af78856/iocore/eventsystem/ProxyAllocator.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/ProxyAllocator.cc b/iocore/eventsystem/ProxyAllocator.cc
index c843bef..67fa579 100644
--- a/iocore/eventsystem/ProxyAllocator.cc
+++ b/iocore/eventsystem/ProxyAllocator.cc
@@ -23,7 +23,7 @@
#include "I_EventSystem.h"
int thread_freelist_high_watermark = 512;
-int thread_freelist_low_watermark = 256;
+int thread_freelist_low_watermark = 32;
void*
thread_alloc(Allocator &a, ProxyAllocator &l)
@@ -44,7 +44,9 @@ thread_alloc(Allocator &a, ProxyAllocator &l)
void
thread_freeup(Allocator &a, ProxyAllocator &l)
{
+#if !TS_USE_RECLAIMABLE_FREELIST
void *head = (void *) l.freelist;
+#endif
void *tail = (void *) l.freelist;
size_t count = 0;
while(l.freelist && l.allocated > thread_freelist_low_watermark){
@@ -52,13 +54,13 @@ thread_freeup(Allocator &a, ProxyAllocator &l)
l.freelist = *(void **) l.freelist;
--(l.allocated);
++count;
-#ifdef TS_USE_RECLAIMABLE_FREELIST
+#if TS_USE_RECLAIMABLE_FREELIST
a.free_void(tail);
#endif
}
-#if !defined(TS_USE_RECLAIMABLE_FREELIST)
+#if !TS_USE_RECLAIMABLE_FREELIST
if (unlikely(count == 1)) {
- a.free_void(head);
+ a.free_void(tail);
} else if(count > 0) {
a.free_void_bulk(head, tail, count);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8af78856/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 4c853b0..54b526a 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -2035,7 +2035,7 @@ RecordElement RecordsConfig[] = {
//############
{RECT_CONFIG, "proxy.config.allocator.thread_freelist_high_watermark", RECD_INT, "512", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.allocator.thread_freelist_low_watermark", RECD_INT, "256", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.allocator.thread_freelist_low_watermark", RECD_INT, "32", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
//############
[2/5] trafficserver git commit: TS-3178: Setting default values in
records.config
Posted by br...@apache.org.
TS-3178: Setting default values in records.config
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ca56b3a9
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ca56b3a9
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ca56b3a9
Branch: refs/heads/master
Commit: ca56b3a93baa1e09a08870b6c12185b25278d0f0
Parents: b452c59
Author: Brian Geffon <br...@apache.org>
Authored: Tue Nov 11 11:25:48 2014 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Nov 11 11:25:48 2014 -0800
----------------------------------------------------------------------
mgmt/RecordsConfig.cc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ca56b3a9/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 8eab182..4c853b0 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -2033,7 +2033,9 @@ RecordElement RecordsConfig[] = {
//# Per-thread freelist / allocator controls
//#
//############
- {RECT_CONFIG, "proxy.config.allocator.thread_freelist_size", RECD_INT, "512", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.allocator.thread_freelist_high_watermark", RECD_INT, "512", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CONFIG, "proxy.config.allocator.thread_freelist_low_watermark", RECD_INT, "256", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
//############
[3/5] trafficserver git commit: TS-3178: Updating Docs
Posted by br...@apache.org.
TS-3178: Updating Docs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/cccad166
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cccad166
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cccad166
Branch: refs/heads/master
Commit: cccad166dd2d2c7724dc12ec2d70e3344a0c654d
Parents: ca56b3a
Author: Brian Geffon <br...@apache.org>
Authored: Tue Nov 11 11:35:39 2014 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Nov 11 11:35:39 2014 -0800
----------------------------------------------------------------------
doc/reference/configuration/records.config.en.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/cccad166/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 41395aa..f4e5c97 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2518,7 +2518,7 @@ Sockets
Sets the maximum number of elements that can be contained in a ProxyAllocator (per-thread)
before returning the objects to the global pool
-.. ts:cv:: CONFIG proxy.config.allocator.thread_freelist_low_watermark INT 256
+.. ts:cv:: CONFIG proxy.config.allocator.thread_freelist_low_watermark INT 32
Sets the minimum number of items a ProxyAllocator (per-thread) will guarantee to be
holding at any one time.
[4/5] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b4a9aeb6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b4a9aeb6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b4a9aeb6
Branch: refs/heads/master
Commit: b4a9aeb609c96d77b8e6d4f0493a07bc13367d95
Parents: cccad16 da06e0b
Author: Brian Geffon <br...@apache.org>
Authored: Tue Nov 11 11:42:16 2014 -0800
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Nov 11 11:42:16 2014 -0800
----------------------------------------------------------------------
iocore/net/SSLInternal.cc | 3 +-
.../experimental/header_normalize/Makefile.in | 842 -------------------
.../header_normalize/header_normalize.cc | 4 +
proxy/http/HttpTransact.cc | 29 +-
proxy/logging/LogBuffer.cc | 7 +-
proxy/logging/LogCollationHostSM.cc | 16 +-
6 files changed, 29 insertions(+), 872 deletions(-)
----------------------------------------------------------------------