From 4a9b8020aab988bdadc7ad386b6dad193d5e1c96 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 13 May 2013 20:56:31 -0700 Subject: [PATCH 1/2] Add ISC license notice for Vinnie Falco's code contributions --- LICENSE | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/LICENSE b/LICENSE index 0388cedaed..07074b554b 100644 --- a/LICENSE +++ b/LICENSE @@ -8,6 +8,21 @@ Copyright (c) 2012 Arthur Britto Copyright (c) 2011-2012 David Schwartz Copyright (c) 2011-2012 Jed McCaleb +Some code: +Copyright (c) 2013 Vinnie Falco + Contributions from Vinnie Falco provided under the terms of the ISC License: + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + Some code from ASIO examples: // Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com) // From 69b876e3d1fae0a887720ea6a6830823e8b0ab0d Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sun, 26 May 2013 14:56:45 -0700 Subject: [PATCH 2/2] Adjust cache sizes based on performance data. --- src/cpp/ripple/Config.cpp | 20 +++++++++----------- src/cpp/ripple/Config.h | 2 -- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/cpp/ripple/Config.cpp b/src/cpp/ripple/Config.cpp index 891bf45fce..4db17eb2a0 100644 --- a/src/cpp/ripple/Config.cpp +++ b/src/cpp/ripple/Config.cpp @@ -503,19 +503,17 @@ void Config::load() int Config::getSize(SizedItemName item) { SizedItem sizeTable[] = { // tiny small medium large huge - { siSweepInterval, { 10, 30, 60, 90, 90 } }, - { siLedgerFetch, { 2, 2, 3, 4, 5 } }, + { siSweepInterval, { 10, 30, 60, 90, 120 } }, + { siLedgerFetch, { 2, 2, 3, 3, 3 } }, { siValidationsSize, { 256, 256, 512, 1024, 1024 } }, { siValidationsAge, { 500, 500, 500, 500, 500 } }, - { siNodeCacheSize, { 8192, 32768, 131072, 1048576, 0 } }, - { siNodeCacheAge, { 30, 60, 90, 300, 600 } }, - { siLedgerSize, { 32, 64, 128, 1024, 0 } }, - { siLedgerAge, { 30, 60, 120, 300, 600 } }, - { siLineCacheSize, { 8192, 32768, 131072, 1048576, 0 } }, - { siLineCacheAge, { 500, 600, 1800, 3600, 7200 } }, - { siHashNodeDBCache, { 24, 48, 64, 128, 256 } }, - { siTxnDBCache, { 4, 12, 48, 96, 192 } }, - { siLgrDBCache, { 4, 8, 32, 64, 128 } }, + { siNodeCacheSize, { 8192, 65536, 262144, 2097152, 0 } }, + { siNodeCacheAge, { 30, 60, 90, 300, 900 } }, + { siLedgerSize, { 32, 128, 256, 2048, 0 } }, + { siLedgerAge, { 30, 90, 180, 300, 900 } }, + { siHashNodeDBCache, { 4, 12, 24, 32, 64 } }, + { siTxnDBCache, { 4, 12, 24, 32, 32 } }, + { siLgrDBCache, { 4, 8, 16, 16, 16 } }, }; for (int i = 0; i < (sizeof(sizeTable) / sizeof(SizedItem)); ++i) diff --git a/src/cpp/ripple/Config.h b/src/cpp/ripple/Config.h index bbb3a6521f..65b02bcc01 100644 --- a/src/cpp/ripple/Config.h +++ b/src/cpp/ripple/Config.h @@ -63,8 +63,6 @@ enum SizedItemName siLedgerSize, siLedgerAge, siLedgerFetch, - siLineCacheSize, - siLineCacheAge, siHashNodeDBCache, siTxnDBCache, siLgrDBCache,