From c56fcc3a3f86ccfda8ce57362d378fc11bd35824 Mon Sep 17 00:00:00 2001 From: Yury Yaroshevich Date: Wed, 19 Dec 2018 21:29:42 +0300 Subject: [PATCH] Use ReadWriteLock to split receive and close execution in SafeCloseDatagramSocket. (#166) * Use ReadWriteLock to split receive and close execution in SafeCloseDatagramSocket. * Me into authors lists. * Removed empty try/finally --- .../ice4j/socket/SafeCloseDatagramSocket.java | 48 +++++-------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/ice4j/socket/SafeCloseDatagramSocket.java b/src/main/java/org/ice4j/socket/SafeCloseDatagramSocket.java index 55f5e0b..51fc765 100644 --- a/src/main/java/org/ice4j/socket/SafeCloseDatagramSocket.java +++ b/src/main/java/org/ice4j/socket/SafeCloseDatagramSocket.java @@ -19,6 +19,7 @@ package org.ice4j.socket; import java.io.*; import java.net.*; +import java.util.concurrent.locks.*; /** * Represents a DatagramSocket which fixes the following problem: when @@ -29,22 +30,17 @@ import java.net.*; * returns. * * @author Lubomir Marinov + * @author Yura Yaroshevich */ public class SafeCloseDatagramSocket extends DelegatingDatagramSocket { - /** - * The number of {@link #receive(DatagramPacket)} calls that have to return - * before {@link #close()} returns. + * A reader-writer lock to prevent {@link #close()} completion if any thread + * is blocked within {@link #receive(DatagramPacket)}. */ - private int inReceive = 0; - - /** - * The Object which synchronizes the access to {@link #inReceive} - * and implements the related inter-thread communication. - */ - private final Object inReceiveSyncRoot = new Object(); + private final ReadWriteLock receiveCloseLock + = new ReentrantReadWriteLock(); /** * Initializes a new SafeCloseDatagramSocket instance and binds it @@ -143,22 +139,10 @@ public class SafeCloseDatagramSocket { super.close(); - synchronized (inReceiveSyncRoot) - { - boolean interrupted = false; - - while (inReceive > 0) - try - { - inReceiveSyncRoot.wait(); - } - catch (InterruptedException iex) - { - interrupted = true; - } - if (interrupted) - Thread.currentThread().interrupt(); - } + final Lock closeLock = receiveCloseLock.writeLock(); + closeLock.lock(); + // we now know all read threads have finished + closeLock.unlock(); } /** @@ -182,21 +166,15 @@ public class SafeCloseDatagramSocket public void receive(DatagramPacket p) throws IOException { - synchronized (inReceiveSyncRoot) - { - inReceive++; - } + final Lock receiveLock = receiveCloseLock.readLock(); + receiveLock.lock(); try { super.receive(p); } finally { - synchronized (inReceiveSyncRoot) - { - inReceive--; - inReceiveSyncRoot.notifyAll(); - } + receiveLock.unlock(); } } }