Renamed to MessageBus. Code cleanup
This commit is contained in:
parent
2247b5f24c
commit
31e9fe84b3
@ -1,9 +1,9 @@
|
|||||||
package dorkbox.util.messagebus;
|
package dorkbox.util.messagebus;
|
||||||
|
|
||||||
import dorkbox.util.messagebus.common.NamedThreadFactory;
|
|
||||||
import dorkbox.util.messagebus.common.simpleq.MessageType;
|
import dorkbox.util.messagebus.common.simpleq.MessageType;
|
||||||
import dorkbox.util.messagebus.common.simpleq.MpmcMultiTransferArrayQueue;
|
import dorkbox.util.messagebus.common.simpleq.MpmcMultiTransferArrayQueue;
|
||||||
import dorkbox.util.messagebus.common.simpleq.MultiNode;
|
import dorkbox.util.messagebus.common.simpleq.MultiNode;
|
||||||
|
import dorkbox.util.messagebus.common.thread.NamedThreadFactory;
|
||||||
import dorkbox.util.messagebus.error.IPublicationErrorHandler;
|
import dorkbox.util.messagebus.error.IPublicationErrorHandler;
|
||||||
import dorkbox.util.messagebus.error.PublicationError;
|
import dorkbox.util.messagebus.error.PublicationError;
|
||||||
import dorkbox.util.messagebus.subscription.Matcher;
|
import dorkbox.util.messagebus.subscription.Matcher;
|
||||||
@ -19,7 +19,7 @@ import java.util.Collection;
|
|||||||
* @author dorkbox, llc
|
* @author dorkbox, llc
|
||||||
* Date: 2/2/15
|
* Date: 2/2/15
|
||||||
*/
|
*/
|
||||||
public class MultiMBassador implements IMessageBus {
|
public class MessageBus implements IMessageBus {
|
||||||
public static final String ERROR_HANDLER_MSG = "INFO: No error handler has been configured to handle exceptions during publication.\n" +
|
public static final String ERROR_HANDLER_MSG = "INFO: No error handler has been configured to handle exceptions during publication.\n" +
|
||||||
"Publication error handlers can be added by bus.addErrorHandler()\n" +
|
"Publication error handlers can be added by bus.addErrorHandler()\n" +
|
||||||
"Falling back to console logger.";
|
"Falling back to console logger.";
|
||||||
@ -43,14 +43,14 @@ public class MultiMBassador implements IMessageBus {
|
|||||||
/**
|
/**
|
||||||
* By default, will permit subTypes and VarArg matching, and will use half of CPUs available for dispatching async messages
|
* By default, will permit subTypes and VarArg matching, and will use half of CPUs available for dispatching async messages
|
||||||
*/
|
*/
|
||||||
public MultiMBassador() {
|
public MessageBus() {
|
||||||
this(Runtime.getRuntime().availableProcessors() / 2);
|
this(Runtime.getRuntime().availableProcessors() / 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param numberOfThreads how many threads to have for dispatching async messages
|
* @param numberOfThreads how many threads to have for dispatching async messages
|
||||||
*/
|
*/
|
||||||
public MultiMBassador(int numberOfThreads) {
|
public MessageBus(int numberOfThreads) {
|
||||||
this(PublishMode.ExactWithSuperTypes, numberOfThreads);
|
this(PublishMode.ExactWithSuperTypes, numberOfThreads);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,7 +58,7 @@ public class MultiMBassador implements IMessageBus {
|
|||||||
* @param publishMode Specifies which publishMode to operate the publication of messages.
|
* @param publishMode Specifies which publishMode to operate the publication of messages.
|
||||||
* @param numberOfThreads how many threads to have for dispatching async messages
|
* @param numberOfThreads how many threads to have for dispatching async messages
|
||||||
*/
|
*/
|
||||||
public MultiMBassador(final PublishMode publishMode, int numberOfThreads) {
|
public MessageBus(final PublishMode publishMode, int numberOfThreads) {
|
||||||
if (numberOfThreads < 2) {
|
if (numberOfThreads < 2) {
|
||||||
numberOfThreads = 2; // at LEAST 2 threads
|
numberOfThreads = 2; // at LEAST 2 threads
|
||||||
}
|
}
|
||||||
@ -86,10 +86,10 @@ public class MultiMBassador implements IMessageBus {
|
|||||||
Runnable runnable = new Runnable() {
|
Runnable runnable = new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
MpmcMultiTransferArrayQueue IN_QUEUE = MultiMBassador.this.dispatchQueue;
|
MpmcMultiTransferArrayQueue IN_QUEUE = MessageBus.this.dispatchQueue;
|
||||||
|
|
||||||
MultiNode node = new MultiNode();
|
MultiNode node = new MultiNode();
|
||||||
while (!MultiMBassador.this.shuttingDown) {
|
while (!MessageBus.this.shuttingDown) {
|
||||||
try {
|
try {
|
||||||
//noinspection InfiniteLoopStatement
|
//noinspection InfiniteLoopStatement
|
||||||
while (true) {
|
while (true) {
|
||||||
@ -113,7 +113,7 @@ public class MultiMBassador implements IMessageBus {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
if (!MultiMBassador.this.shuttingDown) {
|
if (!MessageBus.this.shuttingDown) {
|
||||||
switch (node.messageType) {
|
switch (node.messageType) {
|
||||||
case 1: {
|
case 1: {
|
||||||
handlePublicationError(
|
handlePublicationError(
|
||||||
@ -191,12 +191,12 @@ public class MultiMBassador implements IMessageBus {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void subscribe(final Object listener) {
|
public void subscribe(final Object listener) {
|
||||||
MultiMBassador.this.subscriptionManager.subscribe(listener);
|
MessageBus.this.subscriptionManager.subscribe(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void unsubscribe(final Object listener) {
|
public void unsubscribe(final Object listener) {
|
||||||
MultiMBassador.this.subscriptionManager.unsubscribe(listener);
|
MessageBus.this.subscriptionManager.unsubscribe(listener);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
@ -1,4 +1,4 @@
|
|||||||
package dorkbox.util.messagebus.common;
|
package dorkbox.util.messagebus.common.thread;
|
||||||
|
|
||||||
import java.lang.management.RuntimeMXBean;
|
import java.lang.management.RuntimeMXBean;
|
||||||
import java.util.List;
|
import java.util.List;
|
@ -1,4 +1,6 @@
|
|||||||
package dorkbox.util.messagebus.common;
|
package dorkbox.util.messagebus.utils;
|
||||||
|
|
||||||
|
import dorkbox.util.messagebus.common.ConcurrentHashMapV8;
|
||||||
|
|
||||||
import java.lang.reflect.Array;
|
import java.lang.reflect.Array;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
@ -1,4 +1,4 @@
|
|||||||
package dorkbox.util.messagebus.common;
|
package dorkbox.util.messagebus.utils;
|
||||||
|
|
||||||
import dorkbox.util.messagebus.annotations.Handler;
|
import dorkbox.util.messagebus.annotations.Handler;
|
||||||
import dorkbox.util.messagebus.common.thread.ConcurrentSet;
|
import dorkbox.util.messagebus.common.thread.ConcurrentSet;
|
@ -1,10 +1,11 @@
|
|||||||
package dorkbox.util.messagebus.subscription;
|
package dorkbox.util.messagebus.utils;
|
||||||
|
|
||||||
import dorkbox.util.messagebus.common.ClassUtils;
|
|
||||||
import dorkbox.util.messagebus.common.ConcurrentHashMapV8;
|
import dorkbox.util.messagebus.common.ConcurrentHashMapV8;
|
||||||
import dorkbox.util.messagebus.common.HashMapTree;
|
import dorkbox.util.messagebus.common.HashMapTree;
|
||||||
import dorkbox.util.messagebus.common.thread.ClassHolder;
|
import dorkbox.util.messagebus.common.thread.ClassHolder;
|
||||||
import dorkbox.util.messagebus.common.thread.SubscriptionHolder;
|
import dorkbox.util.messagebus.common.thread.SubscriptionHolder;
|
||||||
|
import dorkbox.util.messagebus.subscription.Subscription;
|
||||||
|
import dorkbox.util.messagebus.utils.ClassUtils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
@ -1,5 +1,8 @@
|
|||||||
package dorkbox.util.messagebus.common;
|
package dorkbox.util.messagebus.utils;
|
||||||
|
|
||||||
|
import dorkbox.util.messagebus.common.ConcurrentHashMapV8;
|
||||||
|
import dorkbox.util.messagebus.common.HashMapTree;
|
||||||
|
import dorkbox.util.messagebus.common.MessageHandler;
|
||||||
import dorkbox.util.messagebus.subscription.Subscription;
|
import dorkbox.util.messagebus.subscription.Subscription;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
Loading…
Reference in New Issue
Block a user