Merge pull request #2199 from eugenp/semaphone_ref

Semaphores refactor
This commit is contained in:
Doha2012 2017-07-03 21:01:50 +02:00 committed by GitHub
commit f04ceabcc5
4 changed files with 36 additions and 62 deletions

View File

@ -2,17 +2,17 @@ package com.baeldung.concurrent.semaphores;
import java.util.concurrent.Semaphore;
public class CounterUsingMutex {
class CounterUsingMutex {
private final Semaphore mutex;
private int count;
public CounterUsingMutex() {
CounterUsingMutex() {
mutex = new Semaphore(1);
count = 0;
}
public void increase() throws InterruptedException {
void increase() throws InterruptedException {
mutex.acquire();
this.count = this.count + 1;
Thread.sleep(1000);
@ -20,11 +20,11 @@ public class CounterUsingMutex {
}
public int getCount() {
int getCount() {
return this.count;
}
public boolean hasQueuedThreads() {
boolean hasQueuedThreads() {
return mutex.hasQueuedThreads();
}

View File

@ -4,19 +4,19 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.concurrent.TimedSemaphore;
public class DelayQueueUsingTimedSemaphore {
class DelayQueueUsingTimedSemaphore {
private final TimedSemaphore semaphore;
public DelayQueueUsingTimedSemaphore(long period, int slotLimit) {
DelayQueueUsingTimedSemaphore(long period, int slotLimit) {
semaphore = new TimedSemaphore(period, TimeUnit.SECONDS, slotLimit);
}
public boolean tryAdd() {
boolean tryAdd() {
return semaphore.tryAcquire();
}
public int availableSlots() {
int availableSlots() {
return semaphore.getAvailablePermits();
}

View File

@ -2,23 +2,23 @@ package com.baeldung.concurrent.semaphores;
import java.util.concurrent.Semaphore;
public class LoginQueueUsingSemaphore {
class LoginQueueUsingSemaphore {
private final Semaphore semaphore;
public LoginQueueUsingSemaphore(int slotLimit) {
LoginQueueUsingSemaphore(int slotLimit) {
semaphore = new Semaphore(slotLimit);
}
public boolean tryLogin() {
boolean tryLogin() {
return semaphore.tryAcquire();
}
public void logout() {
void logout() {
semaphore.release();
}
public int availableSlots() {
int availableSlots() {
return semaphore.availablePermits();
}

View File

@ -1,14 +1,14 @@
package com.baeldung.concurrent.semaphores;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.IntStream;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public class SemaphoresManualTest {
@ -20,12 +20,7 @@ public class SemaphoresManualTest {
final ExecutorService executorService = Executors.newFixedThreadPool(slots);
final LoginQueueUsingSemaphore loginQueue = new LoginQueueUsingSemaphore(slots);
IntStream.range(0, slots)
.forEach(user -> executorService.execute(new Runnable() {
@Override
public void run() {
loginQueue.tryLogin();
}
}));
.forEach(user -> executorService.execute(loginQueue::tryLogin));
executorService.shutdown();
assertEquals(0, loginQueue.availableSlots());
@ -38,12 +33,7 @@ public class SemaphoresManualTest {
final ExecutorService executorService = Executors.newFixedThreadPool(slots);
final LoginQueueUsingSemaphore loginQueue = new LoginQueueUsingSemaphore(slots);
IntStream.range(0, slots)
.forEach(user -> executorService.execute(new Runnable() {
@Override
public void run() {
loginQueue.tryLogin();
}
}));
.forEach(user -> executorService.execute(loginQueue::tryLogin));
executorService.shutdown();
assertEquals(0, loginQueue.availableSlots());
@ -60,12 +50,7 @@ public class SemaphoresManualTest {
final ExecutorService executorService = Executors.newFixedThreadPool(slots);
final DelayQueueUsingTimedSemaphore delayQueue = new DelayQueueUsingTimedSemaphore(1, slots);
IntStream.range(0, slots)
.forEach(user -> executorService.execute(new Runnable() {
@Override
public void run() {
delayQueue.tryAdd();
}
}));
.forEach(user -> executorService.execute(delayQueue::tryAdd));
executorService.shutdown();
assertEquals(0, delayQueue.availableSlots());
@ -78,12 +63,7 @@ public class SemaphoresManualTest {
final ExecutorService executorService = Executors.newFixedThreadPool(slots);
final DelayQueueUsingTimedSemaphore delayQueue = new DelayQueueUsingTimedSemaphore(1, slots);
IntStream.range(0, slots)
.forEach(user -> executorService.execute(new Runnable() {
@Override
public void run() {
delayQueue.tryAdd();
}
}));
.forEach(user -> executorService.execute(delayQueue::tryAdd));
executorService.shutdown();
assertEquals(0, delayQueue.availableSlots());
@ -100,16 +80,13 @@ public class SemaphoresManualTest {
final ExecutorService executorService = Executors.newFixedThreadPool(count);
final CounterUsingMutex counter = new CounterUsingMutex();
IntStream.range(0, count)
.forEach(user -> executorService.execute(new Runnable() {
@Override
public void run() {
try {
counter.increase();
} catch (final InterruptedException e) {
e.printStackTrace();
}
}
}));
.forEach(user -> executorService.execute(() -> {
try {
counter.increase();
} catch (final InterruptedException e) {
e.printStackTrace();
}
}));
executorService.shutdown();
assertTrue(counter.hasQueuedThreads());
@ -121,16 +98,13 @@ public class SemaphoresManualTest {
final ExecutorService executorService = Executors.newFixedThreadPool(count);
final CounterUsingMutex counter = new CounterUsingMutex();
IntStream.range(0, count)
.forEach(user -> executorService.execute(new Runnable() {
@Override
public void run() {
try {
counter.increase();
} catch (final InterruptedException e) {
e.printStackTrace();
}
}
}));
.forEach(user -> executorService.execute(() -> {
try {
counter.increase();
} catch (final InterruptedException e) {
e.printStackTrace();
}
}));
executorService.shutdown();
assertTrue(counter.hasQueuedThreads());
Thread.sleep(5000);