# HG changeset patch # User kazz # Date 1382031801 -32400 # Node ID b90d03c6cb00577090b62a33c8a0f6223314b470 # Parent 1caa6970cf018f79971013fe57e8effecf523ba4 Fix spell diff -r 1caa6970cf01 -r b90d03c6cb00 src/alice/codesegment/InputDataSegment.java --- a/src/alice/codesegment/InputDataSegment.java Fri Oct 18 02:32:40 2013 +0900 +++ b/src/alice/codesegment/InputDataSegment.java Fri Oct 18 02:43:21 2013 +0900 @@ -74,7 +74,7 @@ receive(); } - public void regist() { + public void register() { count.getAndIncrement(); keyCount.getAndIncrement(); } diff -r 1caa6970cf01 -r b90d03c6cb00 src/alice/daemon/AliceDaemon.java --- a/src/alice/daemon/AliceDaemon.java Fri Oct 18 02:32:40 2013 +0900 +++ b/src/alice/daemon/AliceDaemon.java Fri Oct 18 02:43:21 2013 +0900 @@ -38,7 +38,7 @@ } catch (IOException e) { e.printStackTrace(); } - log.info("configurated"); + log.info("configured"); } public void listen() { diff -r 1caa6970cf01 -r b90d03c6cb00 src/alice/datasegment/DataSegment.java --- a/src/alice/datasegment/DataSegment.java Fri Oct 18 02:32:40 2013 +0900 +++ b/src/alice/datasegment/DataSegment.java Fri Oct 18 02:43:21 2013 +0900 @@ -8,28 +8,28 @@ private static DataSegment dataSegment = new DataSegment(); private LocalDataSegmentManager local = new LocalDataSegmentManager(); - private ConcurrentHashMap dataSegmentManageres = new ConcurrentHashMap(); //TODO Over Head + private ConcurrentHashMap dataSegmentManagers = new ConcurrentHashMap(); //TODO Over Head private ConcurrentHashMap acceptHash = new ConcurrentHashMap(); private DataSegment() { - dataSegmentManageres.put("local", local); + dataSegmentManagers.put("local", local); } public static DataSegmentManager get(String key) { - return dataSegment.dataSegmentManageres.get(key); + return dataSegment.dataSegmentManagers.get(key); } public static LocalDataSegmentManager getLocal() { return dataSegment.local; } - public static void regist(String key, DataSegmentManager manager) { - dataSegment.dataSegmentManageres.put(key, manager); + public static void register(String key, DataSegmentManager manager) { + dataSegment.dataSegmentManagers.put(key, manager); } public static RemoteDataSegmentManager connect(String connectionKey, String reverseKey, String hostName, int port, boolean rFlag) { RemoteDataSegmentManager manager = new RemoteDataSegmentManager(connectionKey, reverseKey, hostName, port, rFlag); - regist(connectionKey, manager); + register(connectionKey, manager); return manager; } @@ -42,7 +42,7 @@ } public static void remove(String key){ - dataSegment.dataSegmentManageres.remove(key); + dataSegment.dataSegmentManagers.remove(key); } } diff -r 1caa6970cf01 -r b90d03c6cb00 src/alice/datasegment/Receiver.java --- a/src/alice/datasegment/Receiver.java Fri Oct 18 02:32:40 2013 +0900 +++ b/src/alice/datasegment/Receiver.java Fri Oct 18 02:43:21 2013 +0900 @@ -20,7 +20,7 @@ public Receiver(InputDataSegment ids, CommandType type) { this.ids = ids; this.type = type; - ids.regist(); + ids.register(); } diff -r 1caa6970cf01 -r b90d03c6cb00 src/alice/test/topology/fish/AsignStartX.java --- a/src/alice/test/topology/fish/AsignStartX.java Fri Oct 18 02:32:40 2013 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -package alice.test.topology.fish; - -import alice.codesegment.CodeSegment; -import alice.datasegment.CommandType; -import alice.datasegment.Receiver; - -public class AsignStartX extends CodeSegment { - - public Receiver routing = ids.create(CommandType.PEEK); - public int startX; - public int index; - - public AsignStartX(int startX, int index) { - this.startX = startX; - this.index = index; - } - - @Override - public void run() { - System.out.println("AsignStartX: " + startX); - - RoutingTable routing = this.routing.asClass(RoutingTable.class); - int x = startX; - System.out.println("RoutingTable: " + this.routing.getVal()); - if (this.index >= this.routing.index) { - AsignStartX cs = new AsignStartX(startX, index); - cs.routing.setKey("local", "routing", this.routing.index); - return; - } - for (Routing r : routing.table) { - System.out.println(r.name); - ods.update(r.name, "startX", x); - System.out.println("Assign: " + r.name + ".startX = " + x); - x += r.width; - } - PeekStartX cs = new PeekStartX(this.routing.index); - cs.startX.setKey("local", "startX", this.index); - } - -} diff -r 1caa6970cf01 -r b90d03c6cb00 src/alice/test/topology/fish/AssignStartX.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/alice/test/topology/fish/AssignStartX.java Fri Oct 18 02:43:21 2013 +0900 @@ -0,0 +1,40 @@ +package alice.test.topology.fish; + +import alice.codesegment.CodeSegment; +import alice.datasegment.CommandType; +import alice.datasegment.Receiver; + +public class AssignStartX extends CodeSegment { + + public Receiver routing = ids.create(CommandType.PEEK); + public int startX; + public int index; + + public AssignStartX(int startX, int index) { + this.startX = startX; + this.index = index; + } + + @Override + public void run() { + System.out.println("AssignStartX: " + startX); + + RoutingTable routing = this.routing.asClass(RoutingTable.class); + int x = startX; + System.out.println("RoutingTable: " + this.routing.getVal()); + if (this.index >= this.routing.index) { + AssignStartX cs = new AssignStartX(startX, index); + cs.routing.setKey("local", "routing", this.routing.index); + return; + } + for (Routing r : routing.table) { + System.out.println(r.name); + ods.update(r.name, "startX", x); + System.out.println("Assign: " + r.name + ".startX = " + x); + x += r.width; + } + PeekStartX cs = new PeekStartX(this.routing.index); + cs.startX.setKey("local", "startX", this.index); + } + +} diff -r 1caa6970cf01 -r b90d03c6cb00 src/alice/test/topology/fish/PeekStartX.java --- a/src/alice/test/topology/fish/PeekStartX.java Fri Oct 18 02:32:40 2013 +0900 +++ b/src/alice/test/topology/fish/PeekStartX.java Fri Oct 18 02:43:21 2013 +0900 @@ -16,7 +16,7 @@ @Override public void run() { int startX = this.startX.asInteger(); - AsignStartX cs = new AsignStartX(startX, this.startX.index); + AssignStartX cs = new AssignStartX(startX, this.startX.index); cs.routing.setKey("routing", this.startX.index); }