Changeset 21 for simplerunner/src/main

Timestamp:

09/22/20 08:52:04 (4 years ago)

Author:

bart

Message:

Version 1.5.

Location:

simplerunner/src/main/java/geniusweb/simplerunner

Files:

• BasicConnection.java (modified) (6 diffs)
• ClassPathConnectionFactory.java (modified) (2 diffs)
• NegoRunner.java (modified) (6 diffs)

simplerunner/src/main/java/geniusweb/simplerunner/BasicConnection.java

@@ -3 +3 @@
 import java.io.IOException;
 import java.net.URI;
+import java.util.concurrent.ArrayBlockingQueue;
 
 import geniusweb.connection.ConnectionEnd;
@@ -22 +23 @@
         // to be initialized
         private Listener<OUT> handler = null;
+        private Thread handlerThread;
+        private ArrayBlockingQueue<OUT> messages = new ArrayBlockingQueue<OUT>(4);
 
         /**
@@ -33 +36 @@
                 this.reference = reference;
                 this.uri = uri;
+
         }
 
@@ -47 +51 @@
                 }
                 this.handler = newhandler;
+
+                handlerThread = new Thread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                                try {
+                                        while (true) {
+                                                handler.notifyChange(messages.take());
+                                        }
+                                } catch (InterruptedException e) {
+                                        System.out.println("connection handler interrupted");
+                                }
+                        }
+                });
+
+                handlerThread.start();
         }
 
@@ -55 +75 @@
                                         "BasicConnection has not been initialized");
                 }
-                handler.notifyChange(data);
+                try {
+                        messages.put(data);
+                } catch (InterruptedException e) {
+                        throw new IOException(e);
+                }
         }
 
@@ -70 +94 @@
         @Override
         public void close() {
-
+                handlerThread.interrupt();
+                handlerThread = null;
+                handler = null;
         }
 

simplerunner/src/main/java/geniusweb/simplerunner/ClassPathConnectionFactory.java

@@ -11 +11 @@
 import geniusweb.actions.Action;
 import geniusweb.actions.PartyId;
+import geniusweb.inform.Inform;
 import geniusweb.party.Party;
-import geniusweb.party.inform.Inform;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConn;
 import geniusweb.protocol.partyconnection.ProtocolToPartyConnFactory;
@@ -22 +22 @@
  * <code>classpath:org/my/package/class</code>
  * 
- * 
- *
  */
 public class ClassPathConnectionFactory implements ProtocolToPartyConnFactory {

simplerunner/src/main/java/geniusweb/simplerunner/NegoRunner.java

@@ -29 +29 @@
         private final ProtocolToPartyConnFactory connectionfactory;
         protected final Reporter log;
+        private boolean properlyStopped = false;
         private final static ObjectMapper jackson = new ObjectMapper();
+        private final int LOOPTIME = 200;// ms
+        private long maxruntime;
 
+        /**
+         * 
+         * @param settings
+         * @param connectionfactory
+         * @param logger
+         * @param maxruntime        limit in millisecs. Ignored if 0
+         */
         public NegoRunner(NegoSettings settings,
-                        ProtocolToPartyConnFactory connectionfactory, Reporter logger) {
+                        ProtocolToPartyConnFactory connectionfactory, Reporter logger,
+                        long maxruntime) {
                 if (settings == null || connectionfactory == null) {
                         throw new NullPointerException("Arguments must be not null");
@@ -40 +51 @@
                 this.protocol = settings.getProtocol(log);
                 this.connectionfactory = connectionfactory;
+                this.maxruntime = maxruntime;
+        }
+
+        public boolean isProperlyStopped() {
+                return properlyStopped;
         }
 
@@ -46 +62 @@
                 protocol.addListener(evt -> handle(evt));
                 protocol.start(connectionfactory);
+                long remainingtime = maxruntime;
+                while (!properlyStopped && (maxruntime == 0 || remainingtime > 0)) {
+                        try {
+                                Thread.sleep(LOOPTIME);
+                                remainingtime -= LOOPTIME;
+                        } catch (InterruptedException e) {
+                                e.printStackTrace();
+                        }
+                }
+                System.out.println("end run");
         }
 
@@ -56 +82 @@
 
         protected void stop() {
-                Level level = protocol.getState().getError() == null ? Level.INFO
-                                : Level.WARNING;
-                logFinal(level, protocol.getState());
+                logFinal(Level.INFO, protocol.getState());
+                properlyStopped = true;
         }
 
@@ -88 +113 @@
 
                 NegoRunner runner = new NegoRunner(settings,
-                                new ClassPathConnectionFactory(), new StdOutReporter());
+                                new ClassPathConnectionFactory(), new StdOutReporter(), 0);
                 runner.run();
         }
 
         private static void showusage() {
-                System.err.println("GeniusWeb stand-alone runner. ");
+                System.err.println("GeniusWeb stand-alone runner.");
                 System.err.println("first argument should be <settings.json>.");
                 System.err.println(
@@ -100 +125 @@
                                 "See the settings.json example file and the GeniusWeb wiki pages. ");
 
+        }
+
+        /**
+         * @return protocol that runs/ran the session.
+         */
+        public NegoProtocol getProtocol() {
+                return protocol;
         }
 }