ONOS-841 Renaming ONOS threads to simplify profiling.
Change-Id: I83a96bd875a0af9f3b78c06a9f9107c093b8e64e
diff --git a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
index 8cb09aa..00538e5 100644
--- a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
+++ b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
@@ -45,7 +45,7 @@
private final Logger log = getLogger(getClass());
private final ExecutorService executor =
- newSingleThreadExecutor(namedThreads("event-dispatch-%d"));
+ newSingleThreadExecutor(namedThreads("onos-event-dispatch-%d"));
@SuppressWarnings("unchecked")
private static final Event KILL_PILL = new AbstractEvent(null, 0) {
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index 28dd3dc..292d761 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -111,7 +111,7 @@
@Activate
public void activate() {
- backgroundService = Executors.newSingleThreadScheduledExecutor(namedThreads("device-manager-background"));
+ backgroundService = Executors.newSingleThreadScheduledExecutor(namedThreads("onos-device-manager-background"));
store.setDelegate(delegate);
eventDispatcher.addSink(DeviceEvent.class, listenerRegistry);
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 3ca37cc..44f6473 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -104,7 +104,7 @@
@Activate
public void activate() {
futureService =
- Executors.newFixedThreadPool(32, namedThreads("provider-future-listeners-%d"));
+ Executors.newFixedThreadPool(32, namedThreads("onos-provider-future-listeners-%d"));
store.setDelegate(delegate);
eventDispatcher.addSink(FlowRuleEvent.class, listenerRegistry);
log.info("Started");
diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java b/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
index b74f8b1..6137fa4 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
@@ -116,7 +116,7 @@
@Activate
public synchronized void activate(ComponentContext context) {
- executor = newFixedThreadPool(MAX_THREADS, namedThreads("topo-build-%d"));
+ executor = newFixedThreadPool(MAX_THREADS, namedThreads("onos-topo-build-%d"));
accumulator = new TopologyChangeAccumulator();
logConfig("Configured");
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
index a76eb14..40e060b 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
@@ -266,7 +266,7 @@
*/
private void start() {
isShutdown = false;
- String threadPoolName = "leader-election-" + topicName + "-%d";
+ String threadPoolName = "onos-leader-election-" + topicName + "-%d";
leaderElectionExecutor = Executors.newScheduledThreadPool(2,
namedThreads(threadPoolName));
diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
index 8a5b9f1..8581da6 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
@@ -74,7 +74,7 @@
// TODO: Make Thread pool size configurable.
private final ScheduledExecutorService threadPool =
- Executors.newScheduledThreadPool(25, namedThreads("leadership-manager-%d"));
+ Executors.newScheduledThreadPool(25, namedThreads("onos-leadership-manager-%d"));
private static final MessageSubject LEADERSHIP_UPDATES =
new MessageSubject("leadership-contest-updates");
diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 83664f2..90d7d70 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -187,10 +187,10 @@
clusterCommunicator.addSubscriber(
GossipDeviceStoreMessageSubjects.DEVICE_ADVERTISE, new InternalDeviceAdvertisementListener());
- executor = Executors.newCachedThreadPool(namedThreads("device-fg-%d"));
+ executor = Executors.newCachedThreadPool(namedThreads("onos-device-fg-%d"));
backgroundExecutor =
- newSingleThreadScheduledExecutor(minPriority(namedThreads("device-bg-%d")));
+ newSingleThreadScheduledExecutor(minPriority(namedThreads("onos-device-bg-%d")));
// start anti-entropy thread
backgroundExecutor.scheduleAtFixedRate(new SendAdvertisementTask(),
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
index 4ed31bc..b8d3841 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
@@ -146,10 +146,10 @@
private final ExecutorService futureListeners =
- Executors.newCachedThreadPool(namedThreads("flowstore-peer-responders"));
+ Executors.newCachedThreadPool(namedThreads("onos-flowstore-peer-responders"));
private final ExecutorService backupExecutors =
- Executors.newSingleThreadExecutor(namedThreads("async-backups"));
+ Executors.newSingleThreadExecutor(namedThreads("onos-async-backups"));
private boolean syncBackup = false;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
index 821cdc5..ed83828 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
@@ -165,10 +165,10 @@
HOST_ANTI_ENTROPY_ADVERTISEMENT,
new InternalHostAntiEntropyAdvertisementListener());
- executor = Executors.newCachedThreadPool(namedThreads("host-fg-%d"));
+ executor = Executors.newCachedThreadPool(namedThreads("onos-host-fg-%d"));
backgroundExecutor =
- newSingleThreadScheduledExecutor(minPriority(namedThreads("host-bg-%d")));
+ newSingleThreadScheduledExecutor(minPriority(namedThreads("onos-host-bg-%d")));
// start anti-entropy thread
backgroundExecutor.scheduleAtFixedRate(new SendAdvertisementTask(),
diff --git a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
index dff3b67..279dc94 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/GossipIntentStore.java
@@ -132,10 +132,10 @@
INTENT_ANTI_ENTROPY_ADVERTISEMENT,
new InternalIntentAntiEntropyAdvertisementListener());
- executor = Executors.newCachedThreadPool(namedThreads("intent-fg-%d"));
+ executor = Executors.newCachedThreadPool(namedThreads("onos-intent-fg-%d"));
backgroundExecutor =
- newSingleThreadScheduledExecutor(minPriority(namedThreads("intent-bg-%d")));
+ newSingleThreadScheduledExecutor(minPriority(namedThreads("onos-intent-bg-%d")));
// start anti-entropy thread
//backgroundExecutor.scheduleAtFixedRate(new SendAdvertisementTask(),
diff --git a/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
index 2b6c1c8..2fc9c82 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
@@ -163,10 +163,10 @@
GossipLinkStoreMessageSubjects.LINK_ANTI_ENTROPY_ADVERTISEMENT,
new InternalLinkAntiEntropyAdvertisementListener());
- executor = Executors.newCachedThreadPool(namedThreads("link-fg-%d"));
+ executor = Executors.newCachedThreadPool(namedThreads("onos-link-fg-%d"));
backgroundExecutors =
- newSingleThreadScheduledExecutor(minPriority(namedThreads("link-bg-%d")));
+ newSingleThreadScheduledExecutor(minPriority(namedThreads("onos-link-bg-%d")));
long initialDelaySec = 5;
long periodSec = 5;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolClient.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolClient.java
index b796ccd..75c0969 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolClient.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolClient.java
@@ -103,7 +103,7 @@
public synchronized CompletableFuture<Void> connect() {
if (pool == null || pool.isShutdown()) {
// TODO include remote name?
- pool = newCachedThreadPool(namedThreads("copycat-netty-messaging-client-%d"));
+ pool = newCachedThreadPool(namedThreads("onos-copycat-netty-messaging-client-%d"));
}
return CompletableFuture.completedFuture(null);
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolServer.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolServer.java
index a60f125..aa56855 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolServer.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolServer.java
@@ -62,7 +62,7 @@
@Override
public CompletableFuture<Void> listen() {
if (pool == null || pool.isShutdown()) {
- pool = newCachedThreadPool(namedThreads("copycat-netty-messaging-server-%d"));
+ pool = newCachedThreadPool(namedThreads("onos-copycat-netty-messaging-server-%d"));
}
clusterCommunicator.addSubscriber(COPYCAT_PING, new PingHandler());
diff --git a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseEntryExpirationTracker.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseEntryExpirationTracker.java
index 7982d0d..4d89aa7 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseEntryExpirationTracker.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseEntryExpirationTracker.java
@@ -55,7 +55,7 @@
DatabaseUpdateEventListener, EventHandler<LeaderElectEvent> {
private static final ExecutorService THREAD_POOL =
- Executors.newCachedThreadPool(namedThreads("database-stale-entry-expirer-%d"));
+ Executors.newCachedThreadPool(namedThreads("onos-db-stale-entry-expirer-%d"));
private final Logger log = LoggerFactory.getLogger(getClass());
diff --git a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseManager.java
index 117730a..6931b66 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseManager.java
@@ -218,7 +218,7 @@
copycat.start().get();
executor =
- newSingleThreadScheduledExecutor(namedThreads("db-heartbeat-%d"));
+ newSingleThreadScheduledExecutor(namedThreads("onos-db-heartbeat-%d"));
executor.scheduleWithFixedDelay(new LeaderAdvertiser(), 5, 2, TimeUnit.SECONDS);
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseStateMachine.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseStateMachine.java
index b3cdf62..150522c 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseStateMachine.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseStateMachine.java
@@ -66,7 +66,7 @@
private final Logger log = getLogger(getClass());
private final ExecutorService updatesExecutor =
- Executors.newSingleThreadExecutor(namedThreads("database-statemachine-updates"));
+ Executors.newSingleThreadExecutor(namedThreads("onos-db-statemachine-updates"));
// message subject for database update notifications.
public static final MessageSubject DATABASE_UPDATE_EVENTS =
diff --git a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLockManager.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLockManager.java
index 26f4b67..c131b6e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLockManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLockManager.java
@@ -53,7 +53,7 @@
public class DistributedLockManager implements LockService {
private static final ExecutorService THREAD_POOL =
- Executors.newCachedThreadPool(namedThreads("lock-manager-%d"));
+ Executors.newCachedThreadPool(namedThreads("onos-lock-manager-%d"));
private final Logger log = getLogger(getClass());