echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crypto: Don't start YK thread in constructor (ticket #973)

Browse Source
This commit is contained in:
zzz
2014-05-20 13:14:55 +00:00
parent 4167cd955b
commit a766eca283
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/src/net/i2p/crypto/ElGamalEngine.java
View File

@ -73,6 +73,7 @@ public class ElGamalEngine {
_context = context;
_log = context.logManager().getLog(ElGamalEngine.class);
_ykgen = new YKGenerator(context);
_ykgen.start();
}
/**

32
core/java/src/net/i2p/crypto/YKGenerator.java
View File

@ -41,7 +41,7 @@ class YKGenerator {
private final int MAX_NUM_BUILDERS;
private final int CALC_DELAY;
private final LinkedBlockingQueue<BigInteger[]> _values;
private final Thread _precalcThread;
private Thread _precalcThread;
private final I2PAppContext ctx;
private volatile boolean _isRunning;
@ -52,6 +52,10 @@ class YKGenerator {
public final static int DEFAULT_YK_PRECALC_MAX = 50;
public final static int DEFAULT_YK_PRECALC_DELAY = 200;
/**
* Caller must also call start() to start the background precalc thread.
* Unit tests will still work without calling start().
*/
public YKGenerator(I2PAppContext context) {
ctx = context;
@ -72,6 +76,19 @@ class YKGenerator {
ctx.statManager().createRateStat("crypto.YKUsed", "Need a YK from the queue", "Encryption", new long[] { 60*60*1000 });
ctx.statManager().createRateStat("crypto.YKEmpty", "YK queue empty", "Encryption", new long[] { 60*60*1000 });
}
/**
* Start the background precalc thread.
* Must be called for normal operation.
* If not called, all generation happens in the foreground.
* Not required for unit tests.
*
* @since 0.9.14
*/
public synchronized void start() {
if (_isRunning)
return;
_precalcThread = new I2PThread(new YKPrecalcRunner(MIN_NUM_BUILDERS, MAX_NUM_BUILDERS),
"YK Precalc", true);
_precalcThread.setPriority(Thread.MIN_PRIORITY);
@ -80,12 +97,15 @@ class YKGenerator {
}
/**
* Note that this stops the precalc thread
* and it cannot be restarted.
* Stop the background precalc thread.
* Can be restarted.
* Not required for unit tests.
*
* @since 0.8.8
*/
public void shutdown() {
public synchronized void shutdown() {
_isRunning = false;
if (_precalcThread != null)
_precalcThread.interrupt();
_values.clear();
}
@ -101,11 +121,11 @@ class YKGenerator {
/** @return rv[0] = Y; rv[1] = K */
public BigInteger[] getNextYK() {
ctx.statManager().addRateData("crypto.YKUsed", 1, 0);
ctx.statManager().addRateData("crypto.YKUsed", 1);
BigInteger[] rv = _values.poll();
if (rv != null)
return rv;
ctx.statManager().addRateData("crypto.YKEmpty", 1, 0);
ctx.statManager().addRateData("crypto.YKEmpty", 1);
return generateYK();
}