Removed synchronized() around Average{MinMax}

belaban · Dec 10, 2024 · f75552e · f75552e
1 parent 213966c
commit f75552e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 34 deletions.
diff --git a/src/org/jgroups/blocks/RequestCorrelator.java b/src/org/jgroups/blocks/RequestCorrelator.java
@@ -361,19 +361,15 @@ protected void dispatch(final Message msg, final Header hdr) {
                 long start=System.nanoTime();
                 handleRequest(msg, hdr);
                 long time=(long)((System.nanoTime() - start) / 1000.0);
-                synchronized(avg_req_delivery) {
-                    avg_req_delivery.add(time);
-                }
+                avg_req_delivery.add(time);
                 break;
 
             case Header.RSP:
             case Header.EXC_RSP:
                 start=System.nanoTime();
                 handleResponse(msg, hdr);
                 time=(long)((System.nanoTime() - start) / 1000.0);
-                synchronized(avg_rsp_delivery) {
-                    avg_rsp_delivery.add(time);
-                }
+                avg_rsp_delivery.add(time);
                 break;
 
             default:

diff --git a/src/org/jgroups/protocols/THREAD_COUNT.java b/src/org/jgroups/protocols/THREAD_COUNT.java
@@ -39,9 +39,7 @@ public Object down(Message msg) {
             return down_prot.down(msg);
         try {
             int cnt=down_count.incrementAndGet();
-            synchronized(avg_down) {
-                avg_down.add(cnt);
-            }
+            avg_down.add(cnt);
             return down_prot.down(msg);
         }
         finally {
@@ -55,9 +53,7 @@ public Object up(Message msg) {
             return up_prot.up(msg);
         try {
             int cnt=up_count.incrementAndGet();
-            synchronized(avg_up) {
-                avg_up.add(cnt);
-            }
+            avg_up.add(cnt);
             return up_prot.up(msg);
         }
         finally {
@@ -73,9 +69,7 @@ public void up(MessageBatch batch) {
         }
         try {
             int cnt=up_count.incrementAndGet();
-            synchronized(avg_up) {
-                avg_up.add(cnt);
-            }
+            avg_up.add(cnt);
             up_prot.up(batch);
         }
         finally {

diff --git a/tests/junit-functional/org/jgroups/blocks/CounterTest.java b/tests/junit-functional/org/jgroups/blocks/CounterTest.java
@@ -103,9 +103,7 @@ public void testAsyncIncrement() throws TimeoutException {
               .thenAccept(v -> {
                   values[(int)v.longValue()]=v;
                   long time=Util.micros()-start;
-                  synchronized(avg) {
-                      avg.add(time);
-                  }
+                  avg.add(time);
               });
         }
         Util.waitUntil(50000, 1, () -> IntStream.rangeClosed(1, 999).allMatch(i -> values[i] > 0));

diff --git a/tests/util/org/jgroups/util/ProtPerfHelper.java b/tests/util/org/jgroups/util/ProtPerfHelper.java
@@ -277,25 +277,15 @@ protected static class Entry {
         protected final AverageMinMax avg_up=new AverageMinMax().unit(NANOSECONDS);
 
         protected void add(long value, boolean down) {
-            if(down) {
-                synchronized(avg_down) {
-                    avg_down.add(value);
-                }
-            }
-            else {
-                synchronized(avg_up) {
-                    avg_up.add(value);
-                }
-            }
+            if(down)
+                avg_down.add(value);
+            else
+                avg_up.add(value);
         }
 
         protected void clear() {
-            synchronized(avg_down) {
-                avg_down.clear();
-            }
-            synchronized(avg_up) {
-                avg_up.clear();
-            }
+            avg_down.clear();
+            avg_up.clear();
         }
 
         public String toString() {