Merge pull request #3428 from ControlSystemStudio/pva_echo

PVA search monitor: List PV and client

Author: kasemir

core/pva/src/main/java/org/epics/pva/server/PVASearchMonitorMain.java

@@ -40,15 +40,22 @@ private static class SearchInfo implements Comparable<SearchInfo>
         /** How often some client has searched for it */
         final AtomicLong count = new AtomicLong();
 
-        /** Client that searched most recently */
-        volatile InetSocketAddress client;
+        /** Client that searched for the PV */
+        final InetSocketAddress client;
 
         /** Time of last search */
         volatile Instant last = null;
 
-        SearchInfo(final String name)
+        SearchInfo(final String name, final InetSocketAddress client)
         {
             this.name = name;
+            this.client = client;
+        }
+
+        /** @return Key of PV name and client address */
+        public String getKey()
+        {
+            return name + client.toString();
         }
 
         /** Sort by search count */
@@ -64,7 +71,7 @@ public int compareTo(final SearchInfo other)
         }
     }
 
-    /** Map of PV name to search info */
+    /** Map of PV name and client address to search info */
     private static final ConcurrentHashMap<String, SearchInfo> searches = new ConcurrentHashMap<>();
 
     private static void help()
@@ -147,10 +154,10 @@ else if (arg.startsWith("-v") && (i+1) < args.length)
             if (!once.get()  &&  name.equals("QUIT"))
                 done.countDown();
 
-            final SearchInfo search = searches.computeIfAbsent(name, n -> new SearchInfo(name));
+            final SearchInfo candidate = new SearchInfo(name, addr);
+            final SearchInfo search = searches.computeIfAbsent(candidate.getKey(), k -> candidate);
             search.count.incrementAndGet();
             search.last = Instant.now();
-            search.client = addr;
 
             // Done, don't proceed with default search handler
             return true;