trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject [5/21] git commit: TS-1266 RAM cache stats are wrong with CLFUS
Date Fri, 21 Sep 2012 10:04:39 GMT
TS-1266 RAM cache stats are wrong with CLFUS

Trunk: 20443732b36e8a794a5878737d5a9a18452321e7
test/review: zwoop, jpeach, igalic
backport: igalic


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

Branch: refs/heads/3.2.x
Commit: 763292b5233c47f2ac22c3e0c4ba12bb3ccd45f9
Parents: 90354fb
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Wed Sep 5 17:01:24 2012 -0600
Committer: Igor Galić <i.galic@brainsware.org>
Committed: Fri Sep 21 10:38:18 2012 +0200

----------------------------------------------------------------------
 CHANGES                       |    2 ++
 STATUS                        |    5 -----
 iocore/cache/RamCacheCLFUS.cc |    4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/763292b5/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1ee300b..01623e4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.2.2
 
+  *) [TS-1472] Fix RAM cache stats for CLFUS.
+
   *) [TS-1430] Remove TS_ARG_MAX usage so that platforms with
   unlimited ARG_MAX can build correctly.
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/763292b5/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index e49374d..ca6ffca 100644
--- a/STATUS
+++ b/STATUS
@@ -41,11 +41,6 @@ A list of all bugs open for the next development release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) Fix RAM cache stats for CLFUS.
-   Trunk: 20443732b36e8a794a5878737d5a9a18452321e7
-   Jira: https://issues.apache.org/jira/browse/TS-1472
-   +1: zwoop, jpeach, igalic
-
   *) disable ssl compression by default
    Trunk: 05da7a90ab16f7bc4c6a3e5c7f4880ef80e9b316
    Jira: https://issues.apache.org/jira/browse/TS-1474

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/763292b5/iocore/cache/RamCacheCLFUS.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index becf2fb..69feb42 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -289,7 +289,7 @@ RamCacheCLFUSEntry *RamCacheCLFUS::destroy(RamCacheCLFUSEntry *e) {
   if (!e->flag_bits.lru) {
     objects--;
     bytes -= e->size + ENTRY_OVERHEAD;
-    CACHE_SUM_DYN_STAT_THREAD(cache_ram_cache_bytes_stat, -e->size);
+    CACHE_SUM_DYN_STAT_THREAD(cache_ram_cache_bytes_stat, -(int64_t)e->size);
     e->data = NULL;
   } else
     history--;
@@ -510,7 +510,7 @@ int RamCacheCLFUS::put(INK_MD5 *key, IOBufferData *data, uint32_t len,
bool copy
       return 0;
     }
     bytes -= victim->size + ENTRY_OVERHEAD;
-    CACHE_SUM_DYN_STAT_THREAD(cache_ram_cache_bytes_stat, -victim->size);
+    CACHE_SUM_DYN_STAT_THREAD(cache_ram_cache_bytes_stat, -(int64_t)victim->size);
     victims.enqueue(victim);
     if (victim == compressed)
       compressed = 0;


Mime
View raw message