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

2005-01-26 smeghead

Browse Source 
* i2pProxy.pac, i2pbench.sh, and i2ptest.sh are now shipped with the dist
      packages and installed to $i2pinstalldir/scripts.
    * Added command line params to i2ptest.sh and i2pbench.sh: --gij to run them
      using gij + libgcj, and --sourcedir to run them from the source tree
      instead of the installation directory.
    * Fixed unreachable for() statement clause in the KBucketImpl class that was
      causing gcj to toss a compilation warning (jrandom++).
This commit is contained in:
smeghead
2005-01-27 04:48:41 +00:00
committed by zzz
parent b39958604d
commit 5f6060b801
6 changed files with 87 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -213,6 +213,10 @@
<copy file="hosts.txt" todir="pkg-temp/" />
<copy file="install-headless.txt" todir="pkg-temp/" />
<copy file="history.txt" todir="pkg-temp/" />
<mkdir dir="pkg-temp/scripts" />
<copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" />
<copy file="core/perl/i2pbench.sh" todir="pkg-temp/scripts/" />
<copy file="core/perl/i2ptest.sh" todir="pkg-temp/scripts/" />
<mkdir dir="pkg-temp/docs" />
<copy file="readme.html" todir="pkg-temp/docs/" />
<copy file="installer/resources/startconsole.html" todir="pkg-temp/docs/" />

19
core/perl/i2pbench.sh
View File

@ -1,4 +1,21 @@
#!/usr/bin/perl
# Use the "--gij" parameter to run the tests against libgcj.
# Use the "--sourcedir" parameter if running this from the source tree.
$runtime = "java";
$classpath = "../lib/i2p.jar:../lib/jbigi.jar";
foreach $argv (@ARGV) {
if ($argv eq "--gij") {
$runtime = "gij";
print "\n*** Using gij + libgcj ***\n\n";
}
if ($argv eq "--sourcedir") {
$classpath = "../../build/i2p.jar:../../build/jbigi.jar";
}
}
$javacommand = "$runtime -cp $classpath -Dlogger.shutdownDelay=0";
print "\nBenchmark Suite #1: i2p/core/java/test/net/i2p/crypto/*\n\n";
@ -6,7 +23,7 @@ print "\nBenchmark Suite #1: i2p/core/java/test/net/i2p/crypto/*\n\n";
foreach $testclass (@testclasses) {
print "[BENCHMARK] $testclass:\n\n";
system("java -cp lib/i2p.jar:lib/jbigi.jar net.i2p.crypto.$testclass");
system("$javacommand net.i2p.crypto.$testclass");
print "\n";
}

29
core/perl/i2ptest.sh
View File

@ -1,6 +1,25 @@
#!/usr/bin/perl
# Use the "--gij" parameter to run the tests against libgcj.
# Use the "--sourcedir" parameter if running this from the source tree.
# Yeah yeah, a lot of repetitive code here, but it works for now.
#i2p/apps/proxyscript/i2pProxy.pac
$runtime = "java";
$classpath = "../lib/i2p.jar:../lib/jbigi.jar";
foreach $argv (@ARGV) {
if ($argv eq "--gij") {
$runtime = "gij";
print "\n*** Using gij + libgcj ***\n\n";
}
if ($argv eq "--sourcedir") {
$classpath = "../../build/i2p.jar:../../build/jbigi.jar";
}
}
$javacommand = "$runtime -cp $classpath -Dlogger.shutdownDelay=0";
$failed = 0;
$passed = 0;
$failedtotal = 0;
@ -21,7 +40,7 @@ print "\nTest Suite #1: i2p/core/java/test/net/i2p/data/*Test\n\n";
foreach $testclass (@testclasses) {
print "[TEST] $testclass: ";
if(! system("java -cp lib/i2p.jar:lib/jbigi.jar net.i2p.data.TestData test $testclass $testclass.dat > /dev/null 2>test.tmp")) {
if(! system("$javacommand net.i2p.data.TestData test $testclass $testclass.dat > /dev/null 2>test.tmp")) {
print "OK\n";
$passed++;
} else {
@ -51,7 +70,7 @@ print "\nTest Suite #2: i2p/core/java/test/net/i2p/crypto/*\n\n";
foreach $testclass (@testclasses) {
if ($testclass eq "SessionEncryptionTest") {
print "[TEST] $testclass: ";
if(! system("java -cp lib/i2p.jar:lib/jbigi.jar net.i2p.crypto.SessionEncryptionTest > /dev/null 2>test.tmp")) {
if(! system("$javacommand net.i2p.crypto.SessionEncryptionTest > /dev/null 2>test.tmp")) {
print "OK\n";
$passed++;
} else {
@ -65,7 +84,7 @@ foreach $testclass (@testclasses) {
}
} else {
print "[TEST] $testclass:\n\n";
if(! system("java -cp lib/i2p.jar:lib/jbigi.jar net.i2p.crypto.$testclass")) {
if(! system("$javacommand net.i2p.crypto.$testclass")) {
$passed++;
} else {
$failed++;
@ -90,7 +109,7 @@ print "\nTest Suite #3: Miscellaneous\n\n";
foreach $testclass (@testclasses) {
if ($testclass eq "net.i2p.data.UnsignedInteger") {
print "[TEST] $testclass:\n\n";
if(! system("java -cp lib/i2p.jar:lib/jbigi.jar net.i2p.data.UnsignedInteger")) {
if(! system("$javacommand net.i2p.data.UnsignedInteger")) {
$passed++;
} else {
$failed++;
@ -98,7 +117,7 @@ foreach $testclass (@testclasses) {
print "\n";
} else {
print "[TEST] $testclass: ";
if(! system("java -cp lib/i2p.jar:lib/jbigi.jar $testclass > /dev/null 2>test.tmp")) {
if(! system("$javacommand $testclass > /dev/null 2>test.tmp")) {
print "OK\n";
$passed++;
} else {

11
history.txt
View File

@ -1,4 +1,13 @@
$Id: history.txt,v 1.134 2005/01/26 01:29:19 smeghead Exp $
$Id: history.txt,v 1.135 2005/01/26 19:21:10 smeghead Exp $
2005-01-26 smeghead
* i2pProxy.pac, i2pbench.sh, and i2ptest.sh are now shipped with the dist
packages and installed to $i2pinstalldir/scripts.
* Added command line params to i2ptest.sh and i2pbench.sh: --gij to run them
using gij + libgcj, and --sourcedir to run them from the source tree
instead of the installation directory.
* Fixed unreachable for() statement clause in the KBucketImpl class that was
causing gcj to toss a compilation warning (jrandom++).
2005-01-26 smeghead
* Added a couple of scripts, i2ptest.sh and i2pbench.sh, to manage the core

2
installer/resources/postinstall.sh
View File

@ -56,6 +56,8 @@ esac
cp $wrapperpath/wrapper.jar ./lib/
cp $wrapperpath/i2psvc .
chmod 744 ./i2psvc
chmod 744 ./scripts/i2pbench.sh
chmod 744 ./scripts/i2ptest.sh
rm -rf ./icons
rm -rf ./lib/wrapper
rm -f ./lib/*.dll

51
router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
View File

@ -108,32 +108,39 @@ class KBucketImpl implements KBucket {
return false;
for (int i = 0; i < distance.length; i++) {
if ( (i < upperLimitByte) && (distance[i] != 0x00) ) {
// outright too large
return true;
} else {
int upperVal = 1 << (upperLimitBit % 8);
if (distance[i] > upperVal) {
// still too large, but close
if (i < upperLimitByte) {
if (distance[i] != 0x00) {
// outright too large
return true;
} else if (distance[i] == upperVal) {
// ok, it *may* equal the upper limit,
// if the rest of the bytes are 0
for (int j = i+1; j < distance.length; i++) {
if (distance[j] != 0x00) {
// nope
return true;
}
}
// w00t, the rest is made of 0x00 bytes, so it
// exactly matches the upper limit. kooky, very improbable,
// but possible
}
} else if (i == upperLimitByte) {
if (distance[i] == 0x00) {
// no bits set through the high bit
return false;
} else {
// no bits set before or at the upper limit, so its
// definitely not too large
return false;
int upperVal = 1 << (upperLimitBit % 8);
if (distance[i] > upperVal) {
// still too large, but close
return true;
} else if (distance[i] == upperVal) {
// ok, it *may* equal the upper limit,
// if the rest of the bytes are 0
for (int j = i+1; j < distance.length; j++) {
if (distance[j] != 0x00) {
// nope
return true;
}
}
// w00t, the rest is made of 0x00 bytes, so it
// exactly matches the upper limit. kooky, very improbable,
// but possible
return false;
}
}
} else if (i > upperLimitByte) {
// no bits set before or at the upper limit, so its
// definitely not too large
return false;
}
}
_log.log(Log.CRIT, "wtf, gravity broke: distance=" + DataHelper.toHexString(distance)