diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java index 61af1d9..db1bf1e 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineExchange.java @@ -1,9 +1,4 @@ package com.alignmentsystems.matching; - -import java.io.FileNotFoundException; -import java.nio.ByteBuffer; -import java.util.Properties; - /****************************************************************************** * * Author : John Greenan @@ -14,7 +9,9 @@ * Artefact : ApplicationFIXEngine * Description : *****************************************************************************/ - +import java.io.FileNotFoundException; +import java.nio.ByteBuffer; +import java.util.Properties; import java.util.UUID; import org.apache.kafka.clients.consumer.ConsumerRecord; diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java index 2fa9060..b7be120 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaConsumer.java @@ -41,7 +41,9 @@ public class AlignmentFIXEngineKafkaConsumer extends InterfaceKafkaAbstractSimpl private AlignmentLogEncapsulation log = null; private AlignmentPersistenceToFileClient debugger = null; private Properties props = null; + private final static int MILLISLEEP = 2000; + public AlignmentFIXEngineKafkaConsumer() throws Exception { super(); } @@ -65,7 +67,7 @@ public KafkaConsumer getKafkaConsumer() { } private synchronized void waiter() throws IllegalArgumentException, InterruptedException , IllegalMonitorStateException { - wait(2000); + wait(MILLISLEEP); } diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java index 7017359..ef41776 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXEngineKafkaProducer.java @@ -31,6 +31,7 @@ public class AlignmentFIXEngineKafkaProducer implements InterfaceKafkaProducer, private KafkaProducer kafkaProducerB = null; private AlignmentLogEncapsulation log = null; private AlignmentPersistenceToFileClient debugger = null; + private final static int MILLISLEEP = 2000; @@ -54,7 +55,7 @@ protected void send(String topicName, String key, byte[] binaryMessage) { } private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { - wait(2000); + wait(MILLISLEEP); } @Override diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java index 17b5a98..4bfecf5 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentFIXToBinaryProcessor.java @@ -86,8 +86,7 @@ public void run() { sender = null; } try { - Thread.currentThread(); - Thread.sleep(MILLISLEEP); + sleeper(); } catch (InterruptedException e) { @@ -103,6 +102,11 @@ public void run() { } } + private synchronized void sleeper() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + Thread.currentThread(); + Thread.sleep(MILLISLEEP); + } + /** * * @param topicName diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java index 1277205..367b5b8 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBook.java @@ -68,7 +68,7 @@ public class AlignmentOrderBook private AtomicBoolean initialised = new AtomicBoolean(false); private String symbol = null; private AlignmentLogEncapsulation log = null; - private final int milliSleep = 200; + private final int MILLISLEEP = 200; private OffsetDateTime orderBookCreationTime = null; private OffsetDateTime orderBookLastUpdateTime = null; @@ -407,9 +407,7 @@ public void run() { running.set(true); try { - Thread.currentThread(); - Thread.sleep(milliSleep); - + sleeper(); }catch(InterruptedException e){ running.set(false); @@ -421,4 +419,12 @@ public void run() { System.err.println(new StringBuilder() .append(CLASSNAME).append(Constants.SPACE) .append(e.getMessage()) .toString()); } } + + private synchronized void sleeper() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + Thread.currentThread(); + Thread.sleep(MILLISLEEP); + } + + + } \ No newline at end of file diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java index 32382a1..12735cb 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaConsumer.java @@ -35,6 +35,8 @@ public class AlignmentOrderBookKafkaConsumer extends InterfaceKafkaAbstractSimp public final static String CLASSNAME = AlignmentOrderBookKafkaConsumer.class.getSimpleName(); private final int TIME_OUT_MS = 5000; + private final int MILLISLEEP = 2000; + private KafkaConsumer kafkaConsumer = null; private final AtomicBoolean closed = new AtomicBoolean(false); private AlignmentLogEncapsulation log = null; @@ -137,7 +139,7 @@ public void runAlways(String topicName, InterfaceKafkaMessageHandler callback) t } private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { - wait(2000); + wait(MILLISLEEP); } diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java index 9d12f18..d4fe2cc 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentOrderBookKafkaProducer.java @@ -41,7 +41,7 @@ public class AlignmentOrderBookKafkaProducer implements InterfaceKafkaProducer, private AlignmentPersistenceToFileClient debugger = null; private List listenersMatchEvent = new ArrayList(); private List listenersAddedOrderToOrderBook = new ArrayList(); - + private final int MILLISLEEP = 2000; @Override public void addAddedOrderToOrderBookListener(InterfaceAddedOrderToOrderBook toAdd) { @@ -70,7 +70,7 @@ protected void send(String topicName, String key, byte[] binaryMessage) { } private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { - wait(2000); + wait(MILLISLEEP); } @Override diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java index b35f207..6a1520f 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueNonSequenced.java @@ -33,6 +33,12 @@ public class AlignmentQueueNonSequenced implements Runnable, InterfaceQueueNonSe private AtomicBoolean running = new AtomicBoolean(false); private AtomicBoolean initialised = new AtomicBoolean(false); + private synchronized void sleeper() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + Thread.currentThread(); + Thread.sleep(MILLISLEEP); + } + + @Override public void run() { @@ -46,8 +52,7 @@ public void run() { while (running.get()) { try { - Thread.currentThread(); - Thread.sleep(MILLISLEEP); + sleeper(); } catch (InterruptedException e) { diff --git a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java index 1a289ae..0083b21 100644 --- a/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java +++ b/exchange/src/main/java/com/alignmentsystems/matching/AlignmentQueueSequenced.java @@ -29,7 +29,7 @@ public class AlignmentQueueSequenced implements Runnable, InterfaceQueueSequence protected final static String CLASSNAME = AlignmentQueueSequenced.class.getSimpleName().toString(); private ConcurrentLinkedQueue inQueue; private ConcurrentLinkedQueue outQueue; - private final int milliSleep = 200; + private final int MILLISLEEP = 200; private final int arrayListSize = 100; private final int initialCapacityHashSet = 100; private final float loadFactorHashSet = (float) 0.75; @@ -70,8 +70,7 @@ public void run() { } try { - Thread.currentThread(); - Thread.sleep(milliSleep); + sleeper(); } catch (InterruptedException e) { @@ -87,6 +86,13 @@ public void run() { } } + + private synchronized void sleeper() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + Thread.currentThread(); + Thread.sleep(MILLISLEEP); + } + + @Override public ConcurrentLinkedQueue getOutputQueue() { diff --git a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java index 9c54b47..32123a0 100644 --- a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java +++ b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastInstanceWrapper.java @@ -19,7 +19,6 @@ import com.alignmentsystems.library.constants.KafkaMessageTopology; import com.alignmentsystems.library.enumerations.InstanceType; import com.alignmentsystems.library.interfaces.InterfaceInstanceWrapper; -import com.alignmentsystems.matching.AlignmentInstanceWrapper; /** * @author John Greenan * @@ -27,7 +26,7 @@ public class MulticastInstanceWrapper implements InterfaceInstanceWrapper{ private final String CLASSNAME = this.getClass().getSimpleName(); private InstanceType instanceType ; - + private final int MILLISLEEP = 2000; private AlignmentLogEncapsulation log = new AlignmentLogEncapsulation(this.getClass()); @Override @@ -93,11 +92,15 @@ public boolean initialise(InstanceType instanceType) { while (returnValue) { try { - this.wait(2000); + waiter(); } catch (InterruptedException e) { log.error(e.getMessage() , e ); } } return returnValue; } + + private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + this.wait(MILLISLEEP); + } } \ No newline at end of file diff --git a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServer.java b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServer.java index fa69250..c4f56b0 100644 --- a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServer.java +++ b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServer.java @@ -31,6 +31,7 @@ import com.alignmentsystems.library.AlignmentFunctions; import com.alignmentsystems.library.AlignmentLogEncapsulation; import com.alignmentsystems.library.AlignmentPersistenceToFileClient; +import com.alignmentsystems.library.AlignmentUEH; import com.alignmentsystems.library.enumerations.ConfigurationProperties; import com.alignmentsystems.library.enumerations.Encodings; import com.alignmentsystems.library.enumerations.InstanceType; @@ -44,7 +45,8 @@ */ public class MulticastServer implements InterfaceMulticastServer , Runnable , InterfaceKafkaMessageHandler{ public final static String CLASSNAME = MulticastServer.class.getSimpleName().toString(); - final static Encodings encoding = Encodings.FIXSBELITTLEENDIAN; + private final static Encodings encoding = Encodings.FIXSBELITTLEENDIAN; + private final int MILLISLEEP = 2000; private DatagramSocket socket; private InetAddress group; @@ -84,6 +86,12 @@ public void multicastThis(byte[] multicastBytes) throws IOException { private boolean innerInitialise() { boolean returnValue = Boolean.TRUE; + AlignmentUEH ueh = new AlignmentUEH(); + + Thread.setDefaultUncaughtExceptionHandler(ueh); + + + try { socket = getSocket(); } catch (SocketException e) { @@ -119,6 +127,9 @@ public boolean initialise( , AlignmentPersistenceToFileClient debugger) throws Exception{ this.log = log; this.debugger = debugger; + + + try { this.host = AlignmentFunctions.getProperty(MulticastServer.class.getClassLoader() , InstanceType.MULTICASTSERVER.getProperties(), ConfigurationProperties.MULTICASTHOST); this.port = AlignmentFunctions.getPropertyAsInt(MulticastServer.class.getClassLoader() , InstanceType.MULTICASTSERVER.getProperties(), ConfigurationProperties.MULTICASTPORT); @@ -139,7 +150,7 @@ public void run() { running.set(true); while (running.get()) { try { - wait(2000); + waiter(); } catch (InterruptedException e) { log.error(e.getMessage() , e ); } @@ -147,6 +158,12 @@ public void run() { } + private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + this.wait(MILLISLEEP); + } + + + @Override public void processMessage(String topicName, ConsumerRecord message) throws Exception { //So,we listen to the Kafka queue to see what's going on. diff --git a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java index a90c403..e3f56e7 100644 --- a/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java +++ b/multicastserver/src/main/java/com/alignmentsystems/multicast/MulticastServerKafkaListener.java @@ -41,10 +41,10 @@ public class MulticastServerKafkaListener extends InterfaceKafkaAbstractSimple i private AlignmentLogEncapsulation log = null; private Properties props = null; private AlignmentPersistenceToFileClient debugger = null; + private final int MILLISLEEP = 2000; public MulticastServerKafkaListener() throws Exception { super(); - // TODO Auto-generated constructor stub } /** * @@ -63,12 +63,17 @@ public KafkaConsumer getKafkaConsumer() { return kafkaConsumer; } + private synchronized void waiter() throws IllegalArgumentException , InterruptedException , IllegalMonitorStateException { + this.wait(MILLISLEEP); + } + + @Override public void run() { AtomicBoolean run = new AtomicBoolean(true); while (run.get()) { try { - wait(2000); + waiter(); } catch (InterruptedException e) { log.error(e.getMessage() , e ); }