NullLinkProvider restructured with a CachedThreadPool. This should in theory

allow more LinkDescriptions to be generated. - patch 3/4: Some cleanup/sanity checks added. Reference: ONOS-1033 Change-Id: I0b35585d5fdec3f7e6c921172f39f67dd6723dec

NullLinkProvider restructured with a CachedThreadPool. This should in theory
allow more LinkDescriptions to be generated. - patch 3/4: Some cleanup/sanity checks added. Reference: ONOS-1033 Change-Id: I0b35585d5fdec3f7e6c921172f39f67dd6723dec
Ayaka Koshibe · Ray Milkey
Commit d2c7ad2068b130a8b4033be246b27c8e6d9199b2 d2c7ad20 1 parent 1a7b7bd9
Showing 1 changed file with 96 additions and 35 deletions
providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
--- a/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
View file @d2c7ad2
+++ b/providers/null/link/src/main/java/org/onosproject/provider/nil/link/impl/NullLinkProvider.java
View file @d2c7ad2
@@ -22,13 +22,16 @@ import static org.onlab.util.Tools.toHex;
 import static org.onosproject.net.MastershipRole.MASTER;
 import java.util.Dictionary;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.concurrent.ConcurrentUtils;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -62,6 +65,7 @@ import org.slf4j.Logger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 /**
  * Provider which advertises fake/nonexistent links to the core. To be used for
@@ -95,8 +99,12 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
     private final InternalLinkProvider linkProvider = new InternalLinkProvider();
     private final InternalLinkListener listener = new InternalLinkListener();
+    // True for device with Driver, false otherwise.
+    private final ConcurrentMap<DeviceId, Boolean> driverMap = Maps
+            .newConcurrentMap();
+
     // Link descriptions
-    private final ConcurrentMap<ConnectPoint, LinkDescription> descriptions = Maps
+    private final ConcurrentMap<DeviceId, Set<LinkDescription>> linkDescrs = Maps
             .newConcurrentMap();
     // Local Device ID's that have been seen so far
@@ -104,20 +112,24 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
     // tail ends of other islands
     private final List<ConnectPoint> tails = Lists.newArrayList();
-    private ExecutorService linkDriver = Executors.newFixedThreadPool(1,
+    private final int checkRateDuration = 10;
-            namedThreads("onos-null-link-driver"));
+
+    private ExecutorService linkDriver = Executors.newCachedThreadPool(
+            namedThreads("onos-null-link-driver-%d"));
     // For flicker = true, duration between events in msec.
     @Property(name = "eventRate", value = "0",
             label = "Duration between Link Event")
     private int eventRate = DEFAULT_RATE;
-    private int checkRateDuration = 10;
     // For flicker = true, duration between events in msec.
     @Property(name = "neighbors", value = "",
             label = "Node ID of instance for neighboring island ")
     private String neighbor = "";
+    // flag checked to create a LinkDriver, if rate is non-zero.
+    private boolean flicker = false;
+
     public NullLinkProvider() {
         super(new ProviderId("null", "org.onosproject.provider.nil"));
     }
@@ -126,20 +138,20 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
     public void activate(ComponentContext context) {
         providerService = providerRegistry.register(this);
         linkService = (LinkService) providerRegistry;
+        modified(context);
         linkService.addListener(listener);
         deviceService.addListener(linkProvider);
-        modified(context);
+
         log.info("started");
     }
     @Deactivate
     public void deactivate(ComponentContext context) {
-        if (eventRate != 0) {
+        linkDriver.shutdown();
         try {
             linkDriver.awaitTermination(1000, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
             log.error("LinkBuilder did not terminate");
-            }
             linkDriver.shutdownNow();
         }
         deviceService.removeListener(linkProvider);
@@ -175,10 +187,23 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
         if (newNbor != neighbor) {
             neighbor = newNbor;
         }
-
         if (newRate != 0 & eventRate != newRate) {
             eventRate = newRate;
-            linkDriver.submit(new LinkDriver());
+            flicker = true;
+            // try to find and add drivers for current devices
+            for (Device dev : deviceService.getDevices()) {
+                DeviceId did = dev.id();
+                synchronized (this) {
+                    if (driverMap.get(did) == null || !driverMap.get(did)) {
+                        driverMap.put(dev.id(), true);
+                        linkDriver.submit(new LinkDriver(dev));
+                    }
+                }
+            }
+        } else if (newRate == 0) {
+            driverMap.replaceAll((k, v) -> false);
+        } else {
+            log.warn("Invalid link flicker rate {}", newRate);
         }
         log.info("Using new settings: eventRate={}", eventRate);
@@ -213,24 +238,10 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
         return "";
     }
-    /**
+    private boolean addLdesc(DeviceId did, LinkDescription ldesc) {
-     * Adds links as devices are found, and generates LinkEvents.
+        Set<LinkDescription> ldescs = ConcurrentUtils.putIfAbsent(
-     */
+                linkDescrs, did, Sets.newConcurrentHashSet());
-    private class InternalLinkProvider implements DeviceListener {
+        return ldescs.add(ldesc);
-
-        @Override
-        public void event(DeviceEvent event) {
-            Device dev = event.subject();
-            switch (event.type()) {
-            case DEVICE_ADDED:
-                addLink(dev);
-                break;
-            case DEVICE_REMOVED:
-                removeLink(dev);
-                break;
-            default:
-                break;
-            }
     }
     private void addLink(Device current) {
@@ -261,8 +272,8 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
                 Link.Type.DIRECT);
         LinkDescription rdesc = new DefaultLinkDescription(dst, src,
                 Link.Type.DIRECT);
-            descriptions.put(src, fdesc);
+        addLdesc(prev, fdesc);
-            descriptions.put(dst, rdesc);
+        addLdesc(did, rdesc);
         providerService.linkDetected(fdesc);
         providerService.linkDetected(rdesc);
@@ -281,7 +292,7 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
             }
             LinkDescription ld = new DefaultLinkDescription(cp, first,
                     Link.Type.DIRECT);
-                descriptions.put(cp, ld);
+            addLdesc(cp.deviceId(), ld);
             providerService.linkDetected(ld);
             added = true;
             break;
@@ -291,12 +302,52 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
         }
     }
+    /**
+     * Adds links as devices are found, and generates LinkEvents.
+     */
+    private class InternalLinkProvider implements DeviceListener {
+
+        @Override
+        public void event(DeviceEvent event) {
+            Device dev = event.subject();
+            switch (event.type()) {
+            case DEVICE_ADDED:
+                synchronized (this) {
+                    if (flicker && !driverMap.getOrDefault(dev.id(), false)) {
+                        driverMap.put(dev.id(), true);
+                        linkDriver.submit(new LinkDriver(dev));
+                    }
+                }
+                addLink(dev);
+                break;
+            case DEVICE_REMOVED:
+                driverMap.put(dev.id(), false);
+                removeLink(dev);
+                break;
+            default:
+                break;
+            }
+        }
+
         private void removeLink(Device device) {
             if (!MASTER.equals(roleService.getLocalRole(device.id()))) {
                 return;
             }
             providerService.linksVanished(device.id());
             devices.remove(device.id());
+            synchronized (linkDescrs) {
+                Set<LinkDescription> lds = linkDescrs.remove(device.id());
+                for (LinkDescription ld : lds) {
+                    ConnectPoint src = ld.src();
+                    DeviceId dst = ld.dst().deviceId();
+                    Iterator<LinkDescription> it = linkDescrs.get(dst).iterator();
+                    while (it.hasNext()) {
+                        if (it.next().dst().equals(src)) {
+                            it.remove();
+                        }
+                    }
+                }
+            }
         }
     }
@@ -317,7 +368,7 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
                         LinkDescription ld = new DefaultLinkDescription(event
                                 .subject().dst(), event.subject().src(),
                                 Link.Type.DIRECT);
-                        descriptions.put(event.subject().dst(), ld);
+                        addLdesc(event.subject().dst().deviceId(), ld);
                         providerService.linkDetected(ld);
                     }
                     return;
@@ -334,18 +385,26 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
      * Generates link events using fake links.
      */
     private class LinkDriver implements Runnable {
+        Device myDev;
+        LinkDriver(Device dev) {
+            myDev = dev;
+        }
         @Override
         public void run() {
+            log.info("Thread started for dev {}", myDev.id());
             long startTime = System.currentTimeMillis();
             long countEvent = 0;
             float effLoad = 0;
-            while (!linkDriver.isShutdown()) {
+            while (!linkDriver.isShutdown() && driverMap.get(myDev.id())) {
+                if (linkDescrs.get(myDev.id()) == null) {
+                    addLink(myDev);
+                }
                 //Assuming eventRate is in microsecond unit
                 if (countEvent <= checkRateDuration * 1000000 / eventRate) {
-                    for (LinkDescription desc : descriptions.values()) {
+                    for (LinkDescription desc : linkDescrs.get(myDev.id())) {
                         providerService.linkVanished(desc);
                         countEvent++;
                         try {
@@ -363,8 +422,10 @@ public class NullLinkProvider extends AbstractProvider implements LinkProvider {
                     }
                 } else {
                     // log in WARN the effective load generation rate in events/sec, every 10 seconds
-                    effLoad = (float) (countEvent * 1000 / (System.currentTimeMillis() - startTime));
+                    effLoad = (float) (countEvent * 1000.0 /
-                    log.warn("Effective Loading is {} events/second", String.valueOf(effLoad));
+                            (System.currentTimeMillis() - startTime));
+                    log.warn("Effective Loading for thread is {} events/second",
+                            String.valueOf(effLoad));
                     countEvent = 0;
                     startTime = System.currentTimeMillis();
                 }