# HG changeset patch # User sugi # Date 1397632167 -32400 # Node ID 5fa184113850cf6e52c23acd7f2ca536240a7738 # Parent 2f003d5703d574f8da85d522d191eaaf016c29a5 before adding Branch META_CODESEGMENT diff -r 2f003d5703d5 -r 5fa184113850 src/alice/codesegment/CodeSegment.java --- a/src/alice/codesegment/CodeSegment.java Mon Apr 14 15:46:29 2014 +0900 +++ b/src/alice/codesegment/CodeSegment.java Wed Apr 16 16:09:27 2014 +0900 @@ -10,13 +10,6 @@ public InputDataSegment ids = new InputDataSegment(this); public OutputDataSegment ods = new OutputDataSegment(); public ArrayList list = new ArrayList(); - public CodeSegment codeSegment; - private Class meta; - private boolean flag = false; - - public void setKey(){ - // for meta CodeSegment - } public void execute() { ids.receive(); @@ -30,27 +23,4 @@ } } - @SuppressWarnings("unchecked") - public void setMeta(Class cs){ - flag = true; - meta = (Class) cs; - } - - public boolean hasMeta(){ - return flag; - } - - public void setCodeSegment(CodeSegment cs){ - codeSegment = cs; - } - - public CodeSegment getCodeSegment(){ - return codeSegment; - } - - public Class getMetaClass(){ - flag = false; - return meta; - } - } diff -r 2f003d5703d5 -r 5fa184113850 src/alice/codesegment/CodeSegmentManager.java --- a/src/alice/codesegment/CodeSegmentManager.java Mon Apr 14 15:46:29 2014 +0900 +++ b/src/alice/codesegment/CodeSegmentManager.java Wed Apr 16 16:09:27 2014 +0900 @@ -10,10 +10,10 @@ private static CodeSegmentManager instance = new CodeSegmentManager(); private ThreadPoolExecutor codeSegmentExecutor = new ThreadPoolExecutor(Runtime.getRuntime().availableProcessors(), // initial number of threads - Runtime.getRuntime().availableProcessors(), - Integer.MAX_VALUE, // keepAliveTime - TimeUnit.SECONDS, - new LinkedBlockingQueue()); + Runtime.getRuntime().availableProcessors(), + Integer.MAX_VALUE, // keepAliveTime + TimeUnit.SECONDS, + new LinkedBlockingQueue()); private Logger logger = Logger.getLogger(CodeSegmentManager.class); public static CodeSegmentManager get() { @@ -21,23 +21,11 @@ } public static void submit(CodeSegment cs) { - if (cs.hasMeta()){ - try { - CodeSegment meta = cs.getMetaClass().newInstance(); - meta.setCodeSegment(cs); - meta.setKey(); - - } catch (Exception e) { - e.printStackTrace(); - } - - } else { - CodeSegmentManager csManager = CodeSegmentManager.get(); - csManager.codeSegmentExecutor.execute(cs); - if (csManager.logger.isDebugEnabled()) { - csManager.logger.debug(cs.getClass().getName()); - } + CodeSegmentManager csManager = CodeSegmentManager.get(); + csManager.codeSegmentExecutor.execute(cs); + if (csManager.logger.isDebugEnabled()) { + csManager.logger.debug(cs.getClass().getName()); } } - + } diff -r 2f003d5703d5 -r 5fa184113850 src/alice/topology/manager/StartTopologyManager.java --- a/src/alice/topology/manager/StartTopologyManager.java Mon Apr 14 15:46:29 2014 +0900 +++ b/src/alice/topology/manager/StartTopologyManager.java Wed Apr 16 16:09:27 2014 +0900 @@ -74,7 +74,6 @@ logger.error("File format error: " + conf.confFilePath); e.printStackTrace(); } - HashMap> connectionList = new HashMap>(); ods.put("connection", connectionList); ods.put("_ABSIPTABLE" ,new ArrayList());