Changeset 102 for java/main/src/main/java/com/framsticks/communication/Connection.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/communication/Connection.java (modified) (12 diffs)

java/main/src/main/java/com/framsticks/communication/Connection.java

@@ -18 +18 @@
 import java.io.PrintWriter;
 import java.net.Socket;
-import java.net.SocketTimeoutException;
 import java.util.Collection;
 import java.util.HashSet;
@@ -87 +86 @@
         public Connection setAddress(String address) {
                 return setAddress(new Address(address));
-        }
-
-        public synchronized boolean isConnected() {
-                return socket != null && socket.isConnected();
         }
 
@@ -131 +126 @@
 
                                 readChars = 0;
-                                while (readChars == 0) {
-                                        try {
-                                                readChars = input.read(readBuffer);
-                                        } catch (SocketTimeoutException ignored) {
-                                                //timeout - continue
-                                        }
+                                readChars = input.read(readBuffer);
+                                if (readChars < 0) {
+                                        throw new SocketClosedException().msg("socket is closed");
                                 }
                                 iterator = 0;
@@ -143 +135 @@
                         throw new InterruptedException();
                 } catch (Exception e) {
-                        throw new FramsticksException().msg("failed to read line").cause(e);
+                        log.debug("failed to read line (closing): {}", e.getMessage());
+                        throw new SocketClosedException().msg("failed to read line").cause(e);
                 }
         }
@@ -162 +155 @@
         protected abstract void processNextInputBatch();
 
+
         protected final void processInputBatchesUntilClosed() {
-                while (isRunning() && isConnected()) {
+                while (isRunning() && !socket.isClosed()) {
                         try {
                                 processNextInputBatch();
+                        } catch (SocketClosedException e) {
+                                log.log(isRunning() ? Level.ERROR : Level.DEBUG, "socket is closing: {}", e.getShortMessage(new StringBuilder()));
+                                // log.log(isRunning() ? Level.ERROR : Level.DEBUG, "caught exception: ", e);
+                                break;
                         } catch (FramsticksException e) {
+                                log.debug("{} caught exception in receiver thread {}", this, e.getMessage());
                                 handle(e);
                         } catch (Exception e) {
@@ -173 +172 @@
                         }
                 }
+                log.debug("{} finished processing input", this);
         }
 
@@ -227 +227 @@
                 Dispatching.use(threads, this);
 
-                senderThread.dispatch(new RunAt<Connection>(ThrowExceptionHandler.getInstance()) {
+                senderThread.dispatch(new RunAt<Connection>(this) {
                         @Override
                         protected void runAt() {
@@ -238 +238 @@
                 });
 
-                receiverThread.dispatch(new RunAt<Connection>(ThrowExceptionHandler.getInstance()) {
+                receiverThread.dispatch(new RunAt<Connection>(this) {
                         @Override
                         protected void runAt() {
                                 receiverThreadRoutine();
                                 interruptJoinable();
-                                finishJoinable();
+                                // finishJoinable();
                         }
                 });
@@ -260 +260 @@
 
         protected static void startClientConnection(Connection connection) {
-                while (connection.isRunning() && !connection.isConnected()) {
+                while (connection.isRunning() && connection.socket == null) {
                         log.debug("connecting to {}", connection.address);
                         try {
                                 connection.socket = new Socket(connection.getAddressObject().getHostName(), connection.getAddressObject().getPort());
                         } catch (IOException e) {
-                                log.info("{} failed to connect (retrying): ", connection, e);
+                                log.warn("{} failed to connect (retrying): {}", connection, e.getMessage());
                                 Dispatching.sleep(0.5);
                         }
@@ -272 +272 @@
                 log.debug("{} connected", connection);
                 try {
-                        connection.socket.setSoTimeout(500);
+                        // connection.socket.setSoTimeout(500);
                         connection.setupStreams();
                 } catch (Exception e) {
@@ -319 +319 @@
         @Override
         public void handle(FramsticksException exception) {
+                log.debug("{} handling {}", this, exception.getMessage());
                 exceptionHandler.handle(exception);
         }
@@ -358 +359 @@
         }
 
+        public synchronized boolean isConnected() {
+                return socket != null && socket.isConnected();
+        }
+
 }