Changeset 102 for java/main/src/main/java/com/framsticks/hosting/Server.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/hosting/Server.java (modified) (4 diffs)

java/main/src/main/java/com/framsticks/hosting/Server.java

@@ -37 +37 @@
         protected ServerSocket acceptSocket;
         protected Tree hosted;
-        protected final JoinableCollection<ClientAtServer> clients = new JoinableCollection<ClientAtServer>();
+        protected final JoinableCollection<ClientAtServer> clients = new JoinableCollection<ClientAtServer>(JoinableCollection.FinishPolicy.Never);
 
         public static class Accept {
@@ -68 +68 @@
         }
 
-        @Override
-        protected void joinableInterrupt() {
-                Dispatching.drop(acceptThread, this);
-                Dispatching.drop(hosted, this);
-                Dispatching.drop(clients, this);
-                try {
-                        acceptSocket.close();
-                } catch (IOException e) {
-                        log.debug("exception caught during socket closing: ", e);
-                }
-                finishJoinable();
-        }
 
         /**
@@ -101 +89 @@
         public void childChangedState(Joinable joinable, JoinableState state) {
                 proceedToState(state);
-        }
-
-        @Override
-        protected void joinableStart() {
-                Dispatching.use(acceptThread, this);
-                Dispatching.use(hosted, this);
-                Dispatching.use(clients, this);
-                try {
-                        acceptSocket = new ServerSocket();
-                } catch (IOException e) {
-                        throw new FramsticksException().msg("failed to create server socket").cause(e);
-                }
-                tryBind(0);
         }
 
@@ -175 +150 @@
         }
 
+
+        @Override
+        protected void joinableStart() {
+                Dispatching.use(acceptThread, this);
+                Dispatching.use(hosted, this);
+                Dispatching.use(clients, this);
+                try {
+                        acceptSocket = new ServerSocket();
+                        acceptSocket.setReuseAddress(true);
+                } catch (IOException e) {
+                        throw new FramsticksException().msg("failed to create server socket").cause(e);
+                }
+                tryBind(0);
+        }
+
+        @Override
+        protected void joinableInterrupt() {
+                Dispatching.drop(acceptThread, this);
+                Dispatching.drop(hosted, this);
+                Dispatching.drop(clients, this);
+
+                try {
+                        acceptSocket.close();
+                } catch (IOException e) {
+                        log.debug("exception caught during socket closing: ", e);
+                }
+
+                finishJoinable();
+        }
+
         @Override
         protected void joinableFinish() {