You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/07/02 21:48:56 UTC
[1/2] git commit: TS-1994 Increase default RAM cache size by a
magnitude
Updated Branches:
refs/heads/master 465f8fba9 -> 3885e61a8
TS-1994 Increase default RAM cache size by a magnitude
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d05f47ea
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d05f47ea
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d05f47ea
Branch: refs/heads/master
Commit: d05f47ea40d563a89c0d3d2120aacfb831b7d928
Parents: 465f8fb
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jul 2 13:48:27 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jul 2 13:48:30 2013 -0600
----------------------------------------------------------------------
iocore/cache/Cache.cc | 12 ++++++++----
iocore/cache/RamCacheCLFUS.cc | 3 +--
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d05f47ea/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index b18674a..6ef4b66 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -40,10 +40,12 @@
#endif
// Compilation Options
-
#define USELESS_REENABLES // allow them for now
// #define VERIFY_JTEST_DATA
+static size_t DEFAULT_RAM_CACHE_MULTIPLIER = 10; // I.e. 10x 1MB per 1GB of disk.
+
+
#define DOCACHE_CLEAR_DYN_STAT(x) \
do { \
RecSetRawStatSum(rsb, x, 0); \
@@ -937,9 +939,11 @@ CacheProcessor::cacheInitialized()
}
if (caches_ready) {
- Debug("cache_init", "CacheProcessor::cacheInitialized - caches_ready=0x%0X, gnvol=%d",
- (unsigned int) caches_ready, gnvol);
+ Debug("cache_init", "CacheProcessor::cacheInitialized - caches_ready=0x%0X, gnvol=%d", (unsigned int) caches_ready,
+ gnvol);
+
int64_t ram_cache_bytes = 0;
+
if (gnvol) {
// new ram_caches, with algorithm from the config
for (i = 0; i < gnvol; i++) {
@@ -958,7 +962,7 @@ CacheProcessor::cacheInitialized()
Debug("cache_init", "CacheProcessor::cacheInitialized - cache_config_ram_cache_size == AUTO_SIZE_RAM_CACHE");
for (i = 0; i < gnvol; i++) {
vol = gvol[i];
- gvol[i]->ram_cache->init(vol_dirlen(vol), vol);
+ gvol[i]->ram_cache->init(vol_dirlen(vol) * DEFAULT_RAM_CACHE_MULTIPLIER, vol);
#if TS_USE_INTERIM_CACHE == 1
gvol[i]->history.init(1<<20, 2097143);
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d05f47ea/iocore/cache/RamCacheCLFUS.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index c507eb8..4c06551 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -645,7 +645,6 @@ int RamCacheCLFUSCompressor::mainEvent(int event, Event *e) {
RamCache *new_RamCacheCLFUS() {
RamCacheCLFUS *r = new RamCacheCLFUS;
- eventProcessor.schedule_every(new RamCacheCLFUSCompressor(r), HRTIME_SECOND,
- ET_TASK);
+ eventProcessor.schedule_every(new RamCacheCLFUSCompressor(r), HRTIME_SECOND, ET_TASK);
return r;
}
[2/2] git commit: Added Ts-1994
Posted by zw...@apache.org.
Added Ts-1994
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3885e61a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3885e61a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3885e61a
Branch: refs/heads/master
Commit: 3885e61a8114a5167b01071b1a48a6a989679789
Parents: d05f47e
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jul 2 13:48:48 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jul 2 13:48:48 2013 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3885e61a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 9bbbce4..63dd5f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 3.3.5
+ *) [TS-1994] Increase default RAM cache size by a magnitude.
+
*) [TS-1978] Segfault when trying to set an error from (remap) plugin. This
also fixes a bug where the "default" template was not loaded upon startup.