Changeset 102 for java/main/src/main/java/com/framsticks/util/dispatching/Dispatching.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/util/dispatching/Dispatching.java (modified) (10 diffs)

java/main/src/main/java/com/framsticks/util/dispatching/Dispatching.java

@@ -3 +3 @@
 import java.util.Timer;
 
+import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
 import com.framsticks.util.FramsticksException;
+import com.framsticks.util.Misc;
 
 /**
@@ -32 +34 @@
         }
 
+        public static <C> void dispatch(Dispatcher<C> dispatcher, RunAt<? extends C> runnable) {
+                dispatcher.dispatch(runnable);
+        }
+
         // public static boolean assertInvokeLater(Dispatcher dispatcher, RunAt runnable) {
         //      dispatcher.invokeLater(runnable);
@@ -66 +72 @@
 
         public static void use(final Joinable joinable, final JoinableParent owner) {
+                Misc.throwIfNull(joinable);
                 log.debug("using {} by {}", joinable, owner);
                 if (joinable.use(owner)) {
@@ -75 +82 @@
 
         public static void drop(final Joinable joinable, final JoinableParent owner) {
+                Misc.throwIfNull(joinable);
                 log.debug("droping {} by {}", joinable, owner);
                 if (joinable.drop(owner)) {
@@ -84 +92 @@
 
         public static void join(Joinable joinable) throws InterruptedException {
+                Misc.throwIfNull(joinable);
                 log.debug("joining {}", joinable);
                 try {
@@ -95 +104 @@
 
         public static void childChangedState(final JoinableParent parent, final Joinable joinable, final JoinableState state) {
-                if (state.ordinal() <= JoinableState.RUNNING.ordinal()) {
+                if (state.ordinal() < JoinableState.RUNNING.ordinal()) {
                         return;
                 }
@@ -113 +122 @@
                         }
                 } catch (InterruptedException e) {
+                        log.debug("failed to wait on {} because of: {}", object, e.getMessage());
                 }
         }
@@ -123 +133 @@
                                 return;
                         } catch (InterruptedException e) {
+                                log.debug("failed to join {} because of: {}", joinable, e.getMessage());
                                 // throw new FramsticksException().msg("failed to join").arg("dispatcher", dispatcher).cause(e);
                         }
@@ -192 +203 @@
 
         // public static class DispatcherWaiter<C, T extends Dispatcher<C> & Joinable> implements Dispatcher<C> {
-        //      // protected boolean done = false;
-        //      protected final T dispatcher;
-        //      protected RunAt<? extends C> runnable;
-
-        //      /**
-        //       * @param joinable
-        //       */
-        //      public DispatcherWaiter(T dispatcher) {
-        //              this.dispatcher = dispatcher;
-        //      }
-
-        //      public synchronized void waitFor() {
-        //              while ((runnable == null) && (dispatcher.getState().ordinal() <= JoinableState.RUNNING.ordinal())) {
-        //                      try {
-        //                              this.wait();
-        //                      } catch (InterruptedException e) {
-        //                      }
-        //              }
-        //              if (runnable != null) {
-        //                      runnable.run();
-        //              }
-
-        //      }
-
-        //      @Override
-        //      public boolean isActive() {
-        //              return dispatcher.isActive();
-        //      }
-
-        //      @Override
-        //      public synchronized void dispatch(RunAt<? extends C> runnable) {
-        //              this.runnable = runnable;
-        //              this.notifyAll();
-        //      }
+        //      // protected boolean done = false;
+        //      protected final T dispatcher;
+        //      protected RunAt<? extends C> runnable;
+
+        //      /**
+        //       * @param joinable
+        //       */
+        //      public DispatcherWaiter(T dispatcher) {
+        //              this.dispatcher = dispatcher;
+        //      }
+
+        //      public synchronized void waitFor() {
+        //              while ((runnable == null) && (dispatcher.getState().ordinal() <= JoinableState.RUNNING.ordinal())) {
+        //                      try {
+        //                              this.wait();
+        //                      } catch (InterruptedException e) {
+        //                      }
+        //              }
+        //              if (runnable != null) {
+        //                      runnable.run();
+        //              }
+
+        //      }
+
+        //      @Override
+        //      public boolean isActive() {
+        //              return dispatcher.isActive();
+        //      }
+
+        //      @Override
+        //      public synchronized void dispatch(RunAt<? extends C> runnable) {
+        //              this.runnable = runnable;
+        //              this.notifyAll();
+        //      }
 
         // }
@@ -284 +295 @@
         }
 
+        public static <C> void dispatchLog(final Dispatcher<C> dispatcher, final Logger logger, final Level level, final Object text) {
+                dispatcher.dispatch(new RunAt<C>(ThrowExceptionHandler.getInstance()) {
+
+                        @Override
+                        protected void runAt() {
+                                logger.log(level, "message dispatched into {}: {}", dispatcher, text);
+                        }
+                });
+
+        }
+
 }