Changeset 102 for java/main/src/main/java/com/framsticks/core/AbstractTree.java

Timestamp:

07/16/13 23:31:35 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• add StackedJoinable? as a utility class to allow strict stack policy

for Joinables running

• add SimulatorConnector?
  • provide Experiment with single Simulator instance
  • checks loaded expdef
• fix bug with sockets closure
• improve task dispatching on startup (BufferedDispatcher?)
• draft Experiment implementation
• add NetLoadSaveLogic?
• add WorkPackageLogic?
• add PrimeExperiment? experiment class

CHANGELOG:
Add WorkPackageLogic? and classes representing prime experiment state.

Add classes for PrimeExperiment? state.

Extract single netload routine in Simulator.

Working netload with dummy content in PrimeExperiment?.

More development with NetLoadSaveLogic? and PrimeExperiment?.

Improvement around prime.

Improve BufferedDispatcher?.isActive logic.

Add prime-all.xml configuration.

Manual connecting to existing simulators from GUI.

Guard in SimulatorConnector? against expdef mismatch.

Guard against empty target dispatcher in BufferedDispatcher?.

Make BufferedDispatcher? a Dispatcher (and Joinable).

Minor improvements.

Done StackedJoinable?, improve Experiment.

Develop StackedJoinable?.

Add StackedJoinable? utility joinables controller.

Add dependency on apache-commons-lang.

Add ready ListChange? on Simulators.

Improve hints in ListChange?.

Several improvements.

Found bug with dispatching in Experiment.

Minor improvements.

Fix bug with early finishing Server.

Many changes in Dispatching.

Fix bug with connection.

Do not obfuscate log with socket related exceptions.

Add SocketClosedException?.

Add SimulatorConnector?.

Work out conception of experiment composing of logics building blocks.

Rename SinkInterface? to Sink.

Move saving of Accesses into AccessOperations?.

Some improvements to Experiment.

Improve joinables.

Fix issue with joinables closing.

Add direct and managed consoles to popup menu.

File:

• java/main/src/main/java/com/framsticks/core/AbstractTree.java (modified) (10 diffs)

java/main/src/main/java/com/framsticks/core/AbstractTree.java

@@ -34 +34 @@
 import com.framsticks.util.dispatching.JoinableState;
 import com.framsticks.util.dispatching.RunAt;
-import com.framsticks.util.dispatching.Thread;
 import com.framsticks.util.dispatching.ThrowExceptionHandler;
 import com.framsticks.util.lang.Pair;
@@ -42 +41 @@
  */
 @FramsClassAnnotation
-public abstract class AbstractTree extends AbstractJoinable implements Dispatcher<Tree>, Tree, JoinableParent, NeedFileAcceptor {
+public abstract class AbstractTree extends AbstractJoinable implements Tree, JoinableParent, NeedFileAcceptor {
 
         private static final Logger log = LogManager.getLogger(AbstractTree.class);
@@ -49 +48 @@
         private ExceptionResultHandler handler = ThrowExceptionHandler.getInstance();
 
-        protected final BufferedDispatcher<Tree> bufferedDispatcher = new BufferedDispatcher<>();
+        protected final BufferedDispatcher<Tree> bufferedDispatcher = new BufferedDispatcher<>(this);
 
         protected final PriorityQueue<Pair<Integer, NeedFileAcceptor>> needFileAcceptors = new PriorityQueue<>(32, new Comparator<Pair<Integer, NeedFileAcceptor>>() {
@@ -77 +76 @@
         public void assignRootObject(Object object) {
                 if (root == null) {
-                        throw new FramsticksException().msg("root is has no type specified");
+                        throw new FramsticksException().msg("root has no type specified");
                 }
                 if (root.getObject() != null) {
@@ -89 +88 @@
         public @Nonnull Node getAssignedRoot() {
                 if (root == null) {
-                        throw new FramsticksException().msg("root has no type specified yet");
+                        throw new FramsticksException().msg("root has no type specified yet").arg("in", this);
                 }
                 return root;
@@ -173 +172 @@
         @Override
         public Dispatcher<Tree> getDispatcher() {
-                return bufferedDispatcher.getTargetDispatcher();
+                return bufferedDispatcher;
         }
 
@@ -181 +180 @@
         @Override
         public void setDispatcher(Dispatcher<Tree> dispatcher) {
-                if (bufferedDispatcher.getTargetDispatcher() != null) {
-                        throw new FramsticksException().msg("dispatcher is already set").arg("tree", this).arg("dispatcher", bufferedDispatcher.getTargetDispatcher());
-                }
                 bufferedDispatcher.setTargetDispatcher(dispatcher);
         }
@@ -213 +209 @@
         @Override
         protected void joinableStart() {
-                if (bufferedDispatcher.getTargetDispatcher() == null) {
-                        bufferedDispatcher.setTargetDispatcher(new Thread<Tree>());
-                }
-                Dispatching.use(bufferedDispatcher.getTargetDispatcher(), this);
+                bufferedDispatcher.createThreadIfNeeded();
+                Dispatching.use(bufferedDispatcher, this);
         }
 
         @Override
         protected void joinableInterrupt() {
-                Dispatching.drop(bufferedDispatcher.getTargetDispatcher(), this);
+                Dispatching.drop(bufferedDispatcher, this);
         }
 
@@ -231 +225 @@
         @Override
         protected void joinableJoin() throws InterruptedException {
-                Dispatching.join(bufferedDispatcher.getTargetDispatcher());
+                Dispatching.join(bufferedDispatcher);
         }
 
         @Override
         public void childChangedState(Joinable joinable, JoinableState state) {
-                if (joinable == bufferedDispatcher.getTargetDispatcher()) {
+                if (joinable == bufferedDispatcher) {
                         proceedToState(state);
                 }
@@ -333 +327 @@
                                         }
                                 }
-                                throw new FramsticksException().msg("failed to find need file acceptor in tree").arg("tree", AbstractTree.this);
+                                throw new FramsticksException().msg("failed to find need file acceptor in tree").arg("tree", AbstractTree.this).arg("needfile", needFile);
                         }
                 });