Make methods synchronized; move check for zero; rebase

apache · Feb 10, 2021 · fb87dee · fb87dee
1 parent 7a53be0
commit fb87dee
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/...r/src/main/java/org/apache/pulsar/broker/loadbalance/impl/GenericBrokerHostUsageImpl.java b/...r/src/main/java/org/apache/pulsar/broker/loadbalance/impl/GenericBrokerHostUsageImpl.java
@@ -66,11 +66,9 @@ public SystemResourceUsage getBrokerHostUsage() {
         return usage;
     }
 
-    private void checkCpuLoad() {
-        synchronized (this) {
-            cpuUsageSum += systemBean.getSystemCpuLoad();
-            cpuUsageCount++;
-        }
+    private synchronized void checkCpuLoad() {
+        cpuUsageSum += systemBean.getSystemCpuLoad();
+        cpuUsageCount++;
     }
 
     @Override
@@ -91,19 +89,17 @@ private double getTotalCpuLimit() {
         return 100 * Runtime.getRuntime().availableProcessors();
     }
 
-    private double getTotalCpuUsage() {
-        synchronized (this) {
-            double cpuUsage = cpuUsageSum / cpuUsageCount;
-            cpuUsageSum = 0d;
-            this.cpuUsageCount = 0;
-            return cpuUsage;
+    private synchronized double getTotalCpuUsage() {
+        if (cpuUsageCount == 0) {
+            return 0;
         }
+        double cpuUsage = cpuUsageSum / cpuUsageCount;
+        cpuUsageSum = 0d;
+        cpuUsageCount = 0;
+        return cpuUsage;
     }
 
     private ResourceUsage getCpuUsage() {
-        if (cpuUsageCount == 0) {
-            return new ResourceUsage(0, totalCpuLimit);
-        }
         return new ResourceUsage(getTotalCpuUsage() * totalCpuLimit, totalCpuLimit);
     }