You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2015/12/17 01:55:25 UTC

[1/3] trafficserver git commit: Fix clag analysis issue in the RamCache*.

Repository: trafficserver
Updated Branches:
  refs/heads/master 59bd915ee -> fa377018a


Fix clag analysis issue in the RamCache*.


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

Branch: refs/heads/master
Commit: 94a61e60d7977a4bdc103f75af89a2949a2ae07a
Parents: 90e785e
Author: John Plevyak <jp...@apache.org>
Authored: Mon Dec 14 13:20:55 2015 -0800
Committer: John Plevyak <jp...@acm.org>
Committed: Mon Dec 14 13:24:27 2015 -0800

----------------------------------------------------------------------
 iocore/cache/RamCacheCLFUS.cc | 2 +-
 iocore/cache/RamCacheLRU.cc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/94a61e60/iocore/cache/RamCacheCLFUS.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index 58ee38e..1d9fa11 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -115,7 +115,7 @@ RamCacheCLFUS::size() const
   for (int i = 0; i < 2; i++) {
     forl_LL(RamCacheCLFUSEntry, e, lru[i])
     {
-      s += sizeof(e);
+      s += sizeof(*e);
       if (e->data) {
         s += sizeof(*e->data);
         s += e->data->block_size();

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/94a61e60/iocore/cache/RamCacheLRU.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/RamCacheLRU.cc b/iocore/cache/RamCacheLRU.cc
index 5a6f3a9..4c7cd4b 100644
--- a/iocore/cache/RamCacheLRU.cc
+++ b/iocore/cache/RamCacheLRU.cc
@@ -67,7 +67,7 @@ RamCacheLRU::size() const
   int64_t s = 0;
   forl_LL(RamCacheLRUEntry, e, lru)
   {
-    s += sizeof(e);
+    s += sizeof(*e);
     s += sizeof(*e->data);
     s += e->data->block_size();
   }


[2/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver into apache

Posted by jp...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver into apache


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

Branch: refs/heads/master
Commit: 0b9ea012c6241c1c7b64523889517a39b70fab40
Parents: 94a61e6 b616e28
Author: John Plevyak <jp...@apache.org>
Authored: Wed Dec 16 16:28:00 2015 -0800
Committer: John Plevyak <jp...@acm.org>
Committed: Wed Dec 16 16:28:00 2015 -0800

----------------------------------------------------------------------
 ci/tsqa/tests/test_https.py                     |  68 +-
 configure.ac                                    |   1 +
 doc/admin-guide/plugins/cachekey.en.rst         | 361 +++++++++++
 doc/admin-guide/plugins/index.en.rst            |   1 +
 iocore/net/P_SSLConfig.h                        |   2 +
 iocore/net/SSLConfig.cc                         |   1 +
 iocore/net/SSLUtils.cc                          |   4 +
 mgmt/BaseManager.h                              |   4 +-
 mgmt/FileManager.cc                             |  88 ++-
 mgmt/FileManager.h                              |  17 +-
 mgmt/LocalManager.cc                            |  15 +
 mgmt/ProcessManager.cc                          |  14 +
 mgmt/ProcessManager.h                           |   1 +
 mgmt/ProxyConfig.h                              |   4 +
 mgmt/Rollback.cc                                |  49 +-
 mgmt/Rollback.h                                 |  35 +-
 plugins/experimental/Makefile.am                |   1 +
 plugins/experimental/cachekey/Makefile.am       |  25 +
 plugins/experimental/cachekey/README.md         |  13 +
 plugins/experimental/cachekey/cachekey.cc       | 519 +++++++++++++++
 plugins/experimental/cachekey/cachekey.h        |  81 +++
 plugins/experimental/cachekey/common.cc         |  38 ++
 plugins/experimental/cachekey/common.h          |  62 ++
 plugins/experimental/cachekey/configs.cc        | 428 +++++++++++++
 plugins/experimental/cachekey/configs.h         | 161 +++++
 plugins/experimental/cachekey/pattern.cc        | 505 +++++++++++++++
 plugins/experimental/cachekey/pattern.h         | 137 ++++
 plugins/experimental/cachekey/plugin.cc         | 130 ++++
 .../experimental/cachekey/tests/pattern_test.cc |  66 ++
 .../cachekey/tests/test_cachekey.py             | 636 +++++++++++++++++++
 proxy/Main.cc                                   |   8 +
 proxy/ParentSelection.cc                        |   2 +-
 proxy/http/HttpSM.cc                            |   2 +-
 proxy/http2/HuffmanCodec.cc                     |   4 +-
 proxy/http2/test_Huffmancode.cc                 |   2 +
 35 files changed, 3432 insertions(+), 53 deletions(-)
----------------------------------------------------------------------



[3/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

Posted by jp...@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/fa377018
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fa377018
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fa377018

Branch: refs/heads/master
Commit: fa377018a68e1432ecdbcb1e034c2b824e72c437
Parents: 0b9ea01 59bd915
Author: John Plevyak <jp...@apache.org>
Authored: Wed Dec 16 16:55:33 2015 -0800
Committer: John Plevyak <jp...@acm.org>
Committed: Wed Dec 16 16:55:33 2015 -0800

----------------------------------------------------------------------

----------------------------------------------------------------------