I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

SAM: Convert from I2PThread to I2PAppThread so it won't

Browse Source 
shutdown the whole router when ooming.
This commit is contained in:
zzz
2008-11-20 14:59:55 +00:00
parent 0ff8167425
commit bad4c4a133
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sam/java/src/net/i2p/sam/SAMBridge.java
View File

@ -24,7 +24,7 @@ import java.util.Properties;
import net.i2p.data.DataFormatException; import net.i2p.data.DataFormatException;
import net.i2p.data.Destination; import net.i2p.data.Destination;
import net.i2p.util.I2PThread; import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@ -223,9 +223,9 @@ public class SAMBridge implements Runnable {
opts = parseOptions(args, portIndex+1); opts = parseOptions(args, portIndex+1);
} }
SAMBridge bridge = new SAMBridge(host, port, opts, keyfile); SAMBridge bridge = new SAMBridge(host, port, opts, keyfile);
I2PThread t = new I2PThread(bridge, "SAMListener"); I2PAppThread t = new I2PAppThread(bridge, "SAMListener");
if (Boolean.valueOf(System.getProperty("sam.shutdownOnOOM", "false")).booleanValue()) { if (Boolean.valueOf(System.getProperty("sam.shutdownOnOOM", "false")).booleanValue()) {
I2PThread.addOOMEventListener(new I2PThread.OOMEventListener() { t.addOOMEventThreadListener(new I2PAppThread.OOMEventListener() {
public void outOfMemory(OutOfMemoryError err) { public void outOfMemory(OutOfMemoryError err) {
err.printStackTrace(); err.printStackTrace();
System.err.println("OOMed, die die die"); System.err.println("OOMed, die die die");

6
apps/sam/java/src/net/i2p/sam/SAMHandler.java
View File

@ -14,7 +14,7 @@ import java.io.OutputStream;
import java.net.Socket; import java.net.Socket;
import java.util.Properties; import java.util.Properties;
import net.i2p.util.I2PThread; import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@ -28,7 +28,7 @@ public abstract class SAMHandler implements Runnable {
private final static Log _log = new Log(SAMHandler.class); private final static Log _log = new Log(SAMHandler.class);
protected I2PThread thread = null; protected I2PAppThread thread = null;
protected SAMBridge bridge = null; protected SAMBridge bridge = null;
private Object socketWLock = new Object(); // Guards writings on socket private Object socketWLock = new Object(); // Guards writings on socket
@ -68,7 +68,7 @@ public abstract class SAMHandler implements Runnable {
* *
*/ */
public final void startHandling() { public final void startHandling() {
thread = new I2PThread(this, "SAMHandler"); thread = new I2PAppThread(this, "SAMHandler");
thread.start(); thread.start();
} }

4
apps/sam/java/src/net/i2p/sam/SAMMessageSession.java
View File

@ -22,7 +22,7 @@ import net.i2p.data.Base64;
import net.i2p.data.DataFormatException; import net.i2p.data.DataFormatException;
import net.i2p.data.Destination; import net.i2p.data.Destination;
import net.i2p.util.HexDump; import net.i2p.util.HexDump;
import net.i2p.util.I2PThread; import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@ -74,7 +74,7 @@ public abstract class SAMMessageSession {
handler = new SAMMessageSessionHandler(destStream, props); handler = new SAMMessageSessionHandler(destStream, props);
Thread t = new I2PThread(handler, "SAMMessageSessionHandler"); Thread t = new I2PAppThread(handler, "SAMMessageSessionHandler");
t.start(); t.start();
} }

8
apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
View File

@ -35,7 +35,7 @@ import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.data.Destination; import net.i2p.data.Destination;
import net.i2p.util.ByteCache; import net.i2p.util.ByteCache;
import net.i2p.util.I2PThread; import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@ -160,7 +160,7 @@ public class SAMStreamSession {
if (canReceive) { if (canReceive) {
server = new SAMStreamSessionServer(); server = new SAMStreamSessionServer();
Thread t = new I2PThread(server, "SAMStreamSessionServer"); Thread t = new I2PAppThread(server, "SAMStreamSessionServer");
t.start(); t.start();
} }
@ -315,9 +315,9 @@ public class SAMStreamSession {
sendersMap.put(new Integer(id), sender); sendersMap.put(new Integer(id), sender);
} }
I2PThread t = new I2PThread(reader, "SAMReader" + id); I2PAppThread t = new I2PAppThread(reader, "SAMReader" + id);
t.start(); t.start();
t = new I2PThread(sender, "SAMSender" + id); t = new I2PAppThread(sender, "SAMSender" + id);
t.start(); t.start();
return id; return id;

4
apps/sam/java/src/net/i2p/sam/SAMv2StreamSession.java
View File

@ -26,7 +26,7 @@ import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.data.Destination; import net.i2p.data.Destination;
import net.i2p.util.ByteCache; import net.i2p.util.ByteCache;
import net.i2p.util.I2PThread; import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@ -121,7 +121,7 @@ public class SAMv2StreamSession extends SAMStreamSession
connector = new StreamConnector ( id, d, opts ); connector = new StreamConnector ( id, d, opts );
I2PThread connectThread = new I2PThread ( connector, "StreamConnector" + id ) ; I2PAppThread connectThread = new I2PAppThread ( connector, "StreamConnector" + id ) ;
connectThread.start() ; connectThread.start() ;

4
apps/sam/java/src/net/i2p/sam/client/SAMReader.java
View File

@ -8,7 +8,7 @@ import java.util.StringTokenizer;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.util.I2PThread; import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@ -29,7 +29,7 @@ public class SAMReader {
public void startReading() { public void startReading() {
_live = true; _live = true;
I2PThread t = new I2PThread(new Runner(), "SAM reader"); I2PAppThread t = new I2PAppThread(new Runner(), "SAM reader");
t.start(); t.start();
} }
public void stopReading() { _live = false; } public void stopReading() { _live = false; }

4
apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
View File

@ -10,7 +10,7 @@ import java.util.Map;
import net.i2p.I2PAppContext; import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.util.I2PThread; import net.i2p.util.I2PAppThread;
import net.i2p.util.Log; import net.i2p.util.Log;
/** /**
@ -145,7 +145,7 @@ public class SAMStreamSend {
Sender sender = new Sender(); Sender sender = new Sender();
boolean ok = sender.openConnection(); boolean ok = sender.openConnection();
if (ok) { if (ok) {
I2PThread t = new I2PThread(sender, "Sender"); I2PAppThread t = new I2PAppThread(sender, "Sender");
t.start(); t.start();
} }
} }