Assigning names to various threads
- specify nearby logger when possible
Change-Id: Ia8925ab1459c4d1da922becd0e201388d44d4294
diff --git a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSession.java b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSession.java
index 0352520..f9d2a20 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSession.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSession.java
@@ -31,6 +31,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.onlab.util.Tools.groupedThreads;
+
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.Collection;
@@ -58,7 +60,7 @@
private final BgpSessionInfo remoteInfo; // BGP session remote info
// Timers state
- private Timer timer = new HashedWheelTimer();
+ private Timer timer = new HashedWheelTimer(groupedThreads("BgpSession", "timer-%d", log));
private volatile Timeout keepaliveTimeout; // Periodic KEEPALIVE
private volatile Timeout sessionTimeout; // Session timeout
diff --git a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSessionManager.java b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSessionManager.java
index 92448b4..fbecd68 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSessionManager.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/bgp/BgpSessionManager.java
@@ -136,6 +136,7 @@
*
* @return the BGP sessions
*/
+ @Override
public Collection<BgpSession> getBgpSessions() {
return bgpSessions.values();
}
@@ -145,6 +146,7 @@
*
* @return the selected IPv4 BGP routes among all BGP sessions
*/
+ @Override
public Collection<BgpRouteEntry> getBgpRoutes4() {
return bgpRoutes4.values();
}
@@ -154,6 +156,7 @@
*
* @return the selected IPv6 BGP routes among all BGP sessions
*/
+ @Override
public Collection<BgpRouteEntry> getBgpRoutes6() {
return bgpRoutes6.values();
}
@@ -309,8 +312,8 @@
isShutdown = false;
ChannelFactory channelFactory = new NioServerSocketChannelFactory(
- newCachedThreadPool(groupedThreads("onos/bgp", "sm-boss-%d")),
- newCachedThreadPool(groupedThreads("onos/bgp", "sm-worker-%d")));
+ newCachedThreadPool(groupedThreads("onos/bgp", "sm-boss-%d", log)),
+ newCachedThreadPool(groupedThreads("onos/bgp", "sm-worker-%d", log)));
ChannelPipelineFactory pipelineFactory = () -> {
// Allocate a new session per connection
BgpSession bgpSessionHandler =
diff --git a/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java b/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java
index c30e71d..9065044 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/fpm/FpmManager.java
@@ -121,8 +121,8 @@
private void startServer() {
ChannelFactory channelFactory = new NioServerSocketChannelFactory(
- newCachedThreadPool(groupedThreads("onos/fpm", "sm-boss-%d")),
- newCachedThreadPool(groupedThreads("onos/fpm", "sm-worker-%d")));
+ newCachedThreadPool(groupedThreads("onos/fpm", "sm-boss-%d", log)),
+ newCachedThreadPool(groupedThreads("onos/fpm", "sm-worker-%d", log)));
ChannelPipelineFactory pipelineFactory = () -> {
// Allocate a new session per connection
FpmSessionHandler fpmSessionHandler =