Mercurial > hg > Members > tatsuki > Alice
changeset 37:ebd44d3e8578
add fish scripts
| author | kazz <kazz@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Fri, 20 Jan 2012 19:13:31 +0900 |
| parents | 0b25b48116b6 |
| children | 7e99ae6e4c7d |
| files | scripts/clean.sh scripts/fish_run.sh src/alice/test/topology/fish/AsignStartX.java |
| diffstat | 3 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/clean.sh Fri Jan 20 19:13:31 2012 +0900 @@ -0,0 +1,4 @@ +#!/bin/bash +rm output/*.log +rm ./topology/tree.{dot,png} +rm ./topology/ring.{dot,png} \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/fish_run.sh Fri Jan 20 19:13:31 2012 +0900 @@ -0,0 +1,13 @@ +#!/bin/bash +max=$1 +child_num=$2 +ruby ./topology/treen.rb $1 $2 > ./topology/tree.dot +java -cp ../Alice.jar alice.topology.manager.TopologyManager -p 10000 -conf ./topology/tree.dot & + +cnt=0 +while [ $cnt -lt $max ] +do + java -cp ../Alice.jar alice.test.topology.fish.DistributedFish -host `hostname` -port 10000 -p `expr 20000 + $cnt` >& ./output/fish${cnt}.log & + cnt=`expr $cnt + 1` +done +wait
--- a/src/alice/test/topology/fish/AsignStartX.java Fri Jan 20 18:40:02 2012 +0900 +++ b/src/alice/test/topology/fish/AsignStartX.java Fri Jan 20 19:13:31 2012 +0900 @@ -22,7 +22,7 @@ RoutingTable routing = this.routing.asClass(RoutingTable.class); int x = startX; System.out.println("RoutingTable: " + this.routing.val); - if (this.index + 1 > this.routing.index) { + if (this.index >= this.routing.index) { AsignStartX cs = new AsignStartX(startX, index); cs.routing.setKey("local", "routing", this.routing.index); return;