From 17060c0100c0cef2d8244bc053d3a0a5bc22c72c Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 11 Feb 2020 13:51:12 +0000 Subject: [PATCH] Stats: 4 stats no longer required (thx drzed) --- .../i2p/router/web/helpers/SummaryHelper.java | 24 ------------------- .../crypto/prng/AsyncFortunaStandalone.java | 4 ++-- .../src/net/i2p/crypto/ElGamalEngine.java | 4 ++-- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java index 8104a4ffe..df3542469 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java @@ -781,30 +781,6 @@ public class SummaryHelper extends HelperBase { return String.valueOf(_context.tunnelManager().getInboundBuildQueueSize()); } -/******* - public String getPRNGStatus() { - Rate r = _context.statManager().getRate("prng.bufferWaitTime").getRate(60*1000); - int use = (int) r.getLastEventCount(); - int i = (int) (r.getAverageValue() + 0.5); - if (i <= 0) { - r = _context.statManager().getRate("prng.bufferWaitTime").getRate(10*60*1000); - i = (int) (r.getAverageValue() + 0.5); - } - String rv = i + "/"; - r = _context.statManager().getRate("prng.bufferFillTime").getRate(60*1000); - i = (int) (r.getAverageValue() + 0.5); - if (i <= 0) { - r = _context.statManager().getRate("prng.bufferFillTime").getRate(10*60*1000); - i = (int) (r.getAverageValue() + 0.5); - } - rv = rv + i + "ms"; - // margin == fill time / use time - if (use > 0 && i > 0) - rv = rv + ' ' + (60*1000 / (use * i)) + 'x'; - return rv; - } -********/ - private static boolean updateAvailable() { return NewsHelper.isUpdateAvailable(); } diff --git a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java index 0d138e87d..ffff4a2ac 100644 --- a/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java +++ b/core/java/src/gnu/crypto/prng/AsyncFortunaStandalone.java @@ -45,8 +45,8 @@ public class AsyncFortunaStandalone extends FortunaStandalone implements Runnabl _emptyBuffers = new LinkedBlockingQueue(_bufferCount); _fullBuffers = new LinkedBlockingQueue(_bufferCount); _context = context; - context.statManager().createRequiredRateStat("prng.bufferWaitTime", "Delay for random number buffer (ms)", "Encryption", new long[] { 60*1000, 10*60*1000, 60*60*1000 } ); - context.statManager().createRequiredRateStat("prng.bufferFillTime", "Time to fill random number buffer (ms)", "Encryption", new long[] { 60*1000, 10*60*1000, 60*60*1000 } ); + context.statManager().createRateStat("prng.bufferWaitTime", "Delay for random number buffer (ms)", "Encryption", new long[] { 60*1000, 10*60*1000, 60*60*1000 } ); + context.statManager().createRateStat("prng.bufferFillTime", "Time to fill random number buffer (ms)", "Encryption", new long[] { 60*1000, 10*60*1000, 60*60*1000 } ); _log = context.logManager().getLog(AsyncFortunaStandalone.class); } diff --git a/core/java/src/net/i2p/crypto/ElGamalEngine.java b/core/java/src/net/i2p/crypto/ElGamalEngine.java index 70a11df7d..499976e4d 100644 --- a/core/java/src/net/i2p/crypto/ElGamalEngine.java +++ b/core/java/src/net/i2p/crypto/ElGamalEngine.java @@ -70,10 +70,10 @@ public final class ElGamalEngine { * */ public ElGamalEngine(I2PAppContext context) { - context.statManager().createRequiredRateStat("crypto.elGamal.encrypt", + context.statManager().createRateStat("crypto.elGamal.encrypt", "Time for ElGamal encryption (ms)", "Encryption", new long[] { 60 * 60 * 1000}); - context.statManager().createRequiredRateStat("crypto.elGamal.decrypt", + context.statManager().createRateStat("crypto.elGamal.decrypt", "Time for ElGamal decryption (ms)", "Encryption", new long[] { 60 * 60 * 1000}); _context = context;