Changeset 3fc312a6

Timestamp:

Dec 5, 2011 12:59:58 AM (9 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

51899e9

Parents:

e9d0d79

Message:

locking tweaks

File:

• router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java (modified) (4 diffs)

router/java/src/net/i2p/router/transport/FIFOBandwidthRefiller.java

@@ -4 +4 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import net.i2p.I2PAppContext;
@@ -304 +305 @@
     /** the actual length of the period (nominally REPLENISH_FREQUENCY) */
     private final long[] _times = new long[PERIODS];
+    private final ReentrantReadWriteLock _updateLock = new ReentrantReadWriteLock(false);
 
     /**
@@ -321 +323 @@
      *  @since 0.8.12
      */
-    synchronized int getCurrentParticipatingBandwidth() {
+    int getCurrentParticipatingBandwidth() {
+        _updateLock.readLock().lock();
+        try {
+            return locked_getCurrentParticipatingBandwidth();
+        } finally {
+            _updateLock.readLock().unlock();
+        }
+    }
+
+    private int locked_getCurrentParticipatingBandwidth() {
         int current = _currentParticipating.get();
         long totalTime = (_limiter.now() - _lastPartUpdateTime) + _lastTotalTime;
@@ -338 +349 @@
      *  @since 0.8.12
      */
-    private synchronized void updateParticipating(long now) {
+    private void updateParticipating(long now) {
+        _updateLock.writeLock().lock();
+        try {
+            locked_updateParticipating(now);
+        } finally {
+            _updateLock.writeLock().unlock();
+        }
+    }
+
+    private void locked_updateParticipating(long now) {
         long elapsed = now - _lastPartUpdateTime;
         if (elapsed <= 0) {