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

NDT: Replace Java Timers with SimpleTImer2 to eliminate two non-daemon threads

Browse Source
This commit is contained in:
zzz
2020-05-09 12:12:32 +00:00
parent 4ff234c110
commit ddc372f58c
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/routerconsole/java/src/edu/internet2/ndt/Tcpbw100.java
View File

@ -95,8 +95,6 @@ import java.util.Date;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.StringTokenizer;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicBoolean;
/*
@ -122,6 +120,7 @@ import net.i2p.util.Addresses;
import net.i2p.util.I2PAppThread;
import net.i2p.util.I2PSSLSocketFactory;
import net.i2p.util.Log;
import net.i2p.util.SimpleTimer2;
/*
* Naming convention used: Hungarian, with the following details
@ -1911,14 +1910,14 @@ public class Tcpbw100 extends JApplet implements ActionListener {
}
}.start();
Timer c2sspdUpdateTimer = new Timer();
c2sspdUpdateTimer.scheduleAtFixedRate(new TimerTask() {
PeriodicTimer c2sspdUpdateTimer = new PeriodicTimer() {
@Override
public void run() {
public void timeReached() {
pub_c2sspd = ((NDTConstants.EIGHT * _iPkts * _yabuff2Write.length) / NDTConstants.KILO)
/ (System.currentTimeMillis() - _dTime);
schedule(_c2sspdUpdateTime);
}
}, 100, _c2sspdUpdateTime);
};
// While the 10 s timer ticks, write buffer data into server socket
while (true) {
@ -2139,14 +2138,14 @@ public class Tcpbw100 extends JApplet implements ActionListener {
_dTime = System.currentTimeMillis();
pub_time = _dTime;
Timer s2cspdUpdateTimer = new Timer();
s2cspdUpdateTimer.scheduleAtFixedRate(new TimerTask() {
PeriodicTimer s2cspdUpdateTimer = new PeriodicTimer() {
@Override
public void run() {
public void timeReached() {
pub_s2cspd = ((NDTConstants.EIGHT * pub_bytes) / NDTConstants.KILO)
/ (System.currentTimeMillis() - _dTime);
schedule(_s2cspdUpdateTime);
}
}, 100, _s2cspdUpdateTime);
};
// read data sent by server
try {
@ -4609,4 +4608,13 @@ public class Tcpbw100 extends JApplet implements ActionListener {
//sem.reserve();
}
/**
* @since 0.9.46 to replace Java Timer and TimerTask
*/
private abstract class PeriodicTimer extends SimpleTimer2.TimedEvent {
public PeriodicTimer() {
super(_context.simpleTimer2(), 100);
}
}
} // class: Tcpbw100