diff --git a/apps/BOB/nbproject/private/config.properties b/apps/BOB/nbproject/private/config.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/apps/BOB/nbproject/private/private.properties b/apps/BOB/nbproject/private/private.properties deleted file mode 100644 index 9010904cd..000000000 --- a/apps/BOB/nbproject/private/private.properties +++ /dev/null @@ -1,8 +0,0 @@ -compile.on.save=false -do.depend=false -do.jar=true -javac.debug=true -javadoc.preview=true -jaxbwiz.endorsed.dirs=/usr/local/netbeans-6.8/ide12/modules/ext/jaxb/api -jaxws.endorsed.dir=/usr/local/netbeans-6.5/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5/ide10/modules/ext/jaxb/api -user.properties.file=/root/.netbeans/6.5/build.properties diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml deleted file mode 100644 index eeb608664..000000000 --- a/apps/BOB/nbproject/private/private.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/MUXlisten.java - file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/Main.java - - diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java index 22664c856..b36360339 100644 --- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java +++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java @@ -50,7 +50,7 @@ public class DoCMDS implements Runnable { // FIX ME // I need a better way to do versioning, but this will do for now. - public static final String BMAJ = "00", BMIN = "00", BREV = "0C", BEXT = ""; + public static final String BMAJ = "00", BMIN = "00", BREV = "0D", BEXT = ""; public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT; private Socket server; private Properties props; diff --git a/apps/BOB/src/net/i2p/BOB/TCPio.java b/apps/BOB/src/net/i2p/BOB/TCPio.java index 5e99637dd..20755b5cf 100644 --- a/apps/BOB/src/net/i2p/BOB/TCPio.java +++ b/apps/BOB/src/net/i2p/BOB/TCPio.java @@ -95,10 +95,14 @@ public class TCPio implements Runnable { if (b > 0) { Aout.write(a, 0, b); } else if (b == 0) { - Thread.yield(); // this should act like a mini sleep. - if (Ain.available() == 0) { - Thread.sleep(10); +// Will this die? We'll see. + while(Ain.available() == 0) { + Thread.sleep(20); } +// Thread.yield(); // this should act like a mini sleep. +// if (Ain.available() == 0) { +// Thread.sleep(10); +// } } else { /* according to the specs: * diff --git a/history.txt b/history.txt index f3ecc880a..9bd64c102 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2010-06-29 sponge + * 25%-50% cpu savings in BOB. The remainder of the fix is in streaming + lib, which aparently keeps running and does not sleep according to + profiling. + 2010-06-29 zzz * CapacityCalculator: Cleanup * I2PTunnel: Add default HTTPS outproxy diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f6e6df3a5..4e28a2c8d 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 4; + public final static long BUILD = 5; /** for example "-test" */ public final static String EXTRA = "";