Mercurial > hg > Members > tatsuki > Alice

changeset 60:a76e603c43a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ring relay size
author kazz <kazz@cr.ie.u-ryukyu.ac.jp>
date Thu, 09 Feb 2012 04:44:22 +0900
parents eb1714f41caf
children 84cfcc8e1bce
files src/alice/codesegment/CodeSegmentManager.java src/alice/codesegment/OutputDataSegment.java src/alice/test/topology/ring/CheckMyName.java src/alice/test/topology/ring/FirstRingMessagePassing.java src/alice/test/topology/ring/RingMessagePassing.java src/alice/test/topology/ring/RingTopologyConfig.java
diffstat 6 files changed, 18 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/alice/codesegment/CodeSegmentManager.java	Wed Feb 08 17:35:40 2012 +0900
+++ b/src/alice/codesegment/CodeSegmentManager.java	Thu Feb 09 04:44:22 2012 +0900
@@ -10,7 +10,7 @@
 
 	private static CodeSegmentManager instance = new CodeSegmentManager();
 	public LinkedBlockingQueue<CodeSegment> readyQueue = new LinkedBlockingQueue<CodeSegment>();
-	ThreadPoolExecutor codeSegmentExecutor = new ThreadPoolExecutor(1, // initial number of threads
+	private ThreadPoolExecutor codeSegmentExecutor = new ThreadPoolExecutor(1, // initial number of threads
 												Runtime.getRuntime().availableProcessors(),
 												Integer.MAX_VALUE, // keepAliveTime
 												TimeUnit.SECONDS,
--- a/src/alice/codesegment/OutputDataSegment.java	Wed Feb 08 17:35:40 2012 +0900
+++ b/src/alice/codesegment/OutputDataSegment.java	Thu Feb 09 04:44:22 2012 +0900
@@ -32,6 +32,14 @@
 		DataSegment.get(managerKey).update(key, ValueFactory.createRawValue(val), cs);
 	}
 
+	public void put(String managerKey, String key, byte[] val) {
+		DataSegment.get(managerKey).put(key, ValueFactory.createRawValue(val), cs);
+	}
+	
+	public void update(String managerKey, String key, byte[] val) {
+		DataSegment.get(managerKey).update(key, ValueFactory.createRawValue(val), cs);
+	}
+	
 	public void put(String managerKey, String key, int val) {
 		DataSegment.get(managerKey).put(key, ValueFactory.createIntegerValue(val), cs);
 	}
--- a/src/alice/test/topology/ring/CheckMyName.java	Wed Feb 08 17:35:40 2012 +0900
+++ b/src/alice/test/topology/ring/CheckMyName.java	Thu Feb 09 04:44:22 2012 +0900
@@ -20,7 +20,7 @@
 		String host = this.host.asString();
 		logger.debug(host);
 		if (host.equals("node0")) {
-			ods.put("local", "counter", 0);
+			ods.put("local", "counter", new byte[conf.size]);
 			FirstRingMessagePassing cs1 = new FirstRingMessagePassing(System.nanoTime(), conf.count);
 			cs1.counter.setKey("local", "counter");
 			RingFinish cs2 = new RingFinish("manager");
--- a/src/alice/test/topology/ring/FirstRingMessagePassing.java	Wed Feb 08 17:35:40 2012 +0900
+++ b/src/alice/test/topology/ring/FirstRingMessagePassing.java	Thu Feb 09 04:44:22 2012 +0900
@@ -19,10 +19,8 @@
 	
 	@Override
 	public void run() {
-		int counter = this.counter.asInteger();
-		++counter;
-		ods.put("right", "counter", counter);
-		if (counter >= count) {
+		ods.put("right", "counter", counter.val);
+		if (counter.index >= count) {
 			ods.put("right", "finish", ValueFactory.createNilValue());
 			long endTime = System.nanoTime();
 			long time = endTime - startTime;
--- a/src/alice/test/topology/ring/RingMessagePassing.java	Wed Feb 08 17:35:40 2012 +0900
+++ b/src/alice/test/topology/ring/RingMessagePassing.java	Thu Feb 09 04:44:22 2012 +0900
@@ -10,10 +10,7 @@
 
 	@Override
 	public void run() {
-		int counter = this.counter.asInteger();
-				
-		ods.put("right", "counter", counter);
-		
+		ods.put("right", "counter", this.counter.val);
 		RingMessagePassing cs = new RingMessagePassing();
 		cs.counter.setKey("local", "counter");
 	}
--- a/src/alice/test/topology/ring/RingTopologyConfig.java	Wed Feb 08 17:35:40 2012 +0900
+++ b/src/alice/test/topology/ring/RingTopologyConfig.java	Thu Feb 09 04:44:22 2012 +0900
@@ -3,12 +3,17 @@
 import alice.topology.node.TopologyNodeConfig;
 
 public class RingTopologyConfig extends TopologyNodeConfig {
+	
 	public int count = 10;
+	public int size = 10;
+	
 	public RingTopologyConfig(String[] args) {
 		super(args);
 		for (int i = 0; i < args.length; i++) {
 			if ("-count".equals(args[i])) {
 				this.count = new Integer(args[++i]);
+			} else if ("-size".equals(args[i])) {
+				this.size = new Integer(args[++i]);
 			}
 		}
 	}