You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/10/04 17:03:24 UTC
svn commit: r452907 - in
/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java:
java/nio/channels/spi/ org/apache/harmony/nio/internal/
Author: tellison
Date: Wed Oct 4 08:03:23 2006
New Revision: 452907
URL: http://svn.apache.org/viewvc?view=rev&rev=452907
Log: (empty)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java?view=diff&rev=452907&r1=452906&r2=452907
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java Wed Oct 4 08:03:23 2006
@@ -45,7 +45,8 @@
*/
private List<SelectionKey> keyList = new ArrayList<SelectionKey>();
- private final Object blockingLock = new Object();
+ private class BlockingLock {}
+ private final Object blockingLock = new BlockingLock();
boolean isBlocking = true;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java Wed Oct 4 08:03:23 2006
@@ -87,10 +87,12 @@
boolean isBound = false;
// lock for read and receive
- private final Object readLock = new Object();
+ private class ReadLock {}
+ private final Object readLock = new ReadLock();
// lock for write and send
- private final Object writeLock = new Object();
+ private class WriteLock {}
+ private final Object writeLock = new WriteLock();
// used to store the trafficClass value which is simply returned
// as the value that was set. We also need it to pass it to methods
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java Wed Oct 4 08:03:23 2006
@@ -65,7 +65,8 @@
// The object that will track all outstanding locks on this channel.
private final LockManager lockManager = new LockManager();
- private final Object repositioningLock = new Object();
+ private class RepositioningLock {}
+ private final Object repositioningLock = new RepositioningLock();
private final Object stream;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java Wed Oct 4 08:03:23 2006
@@ -74,7 +74,8 @@
boolean isBound = false;
// lock for accept
- private final Object acceptLock = new Object();
+ private class AcceptLock {}
+ private final Object acceptLock = new AcceptLock();
// ----------------------------------------------------
// Constructor
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java Wed Oct 4 08:03:23 2006
@@ -127,12 +127,11 @@
boolean isBound = false;
// lock for read and write
- private final Object readLock = new Object();
+ private class ReadLock {}
+ private final Object readLock = new ReadLock();
- private final Object writeLock = new Object();
-
- // lock for status
- // private final Object statusLock = new Object();
+ private class WriteLock {}
+ private final Object writeLock = new WriteLock();
// this content is a point used to set in connect_withtimeout() in pending
// mode
Re: svn commit: r452907 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java:
java/nio/channels/spi/ org/apache/harmony/nio/internal/
Posted by Tim Ellison <t....@gmail.com>.
Sorry about the empty log message -- for the record it should say:
"Make objects used for locking more easily identifiable."
tellison@apache.org wrote:
> Author: tellison
> Date: Wed Oct 4 08:03:23 2006
> New Revision: 452907
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=452907
> Log: (empty)
>
> Modified:
> incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
> incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
> incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
> incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
> incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
>
> Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java?view=diff&rev=452907&r1=452906&r2=452907
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java (original)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java Wed Oct 4 08:03:23 2006
> @@ -45,7 +45,8 @@
> */
> private List<SelectionKey> keyList = new ArrayList<SelectionKey>();
>
> - private final Object blockingLock = new Object();
> + private class BlockingLock {}
> + private final Object blockingLock = new BlockingLock();
>
> boolean isBlocking = true;
>
>
> Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java (original)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java Wed Oct 4 08:03:23 2006
> @@ -87,10 +87,12 @@
> boolean isBound = false;
>
> // lock for read and receive
> - private final Object readLock = new Object();
> + private class ReadLock {}
> + private final Object readLock = new ReadLock();
>
> // lock for write and send
> - private final Object writeLock = new Object();
> + private class WriteLock {}
> + private final Object writeLock = new WriteLock();
>
> // used to store the trafficClass value which is simply returned
> // as the value that was set. We also need it to pass it to methods
>
> Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java (original)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java Wed Oct 4 08:03:23 2006
> @@ -65,7 +65,8 @@
> // The object that will track all outstanding locks on this channel.
> private final LockManager lockManager = new LockManager();
>
> - private final Object repositioningLock = new Object();
> + private class RepositioningLock {}
> + private final Object repositioningLock = new RepositioningLock();
>
> private final Object stream;
>
>
> Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java (original)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java Wed Oct 4 08:03:23 2006
> @@ -74,7 +74,8 @@
> boolean isBound = false;
>
> // lock for accept
> - private final Object acceptLock = new Object();
> + private class AcceptLock {}
> + private final Object acceptLock = new AcceptLock();
>
> // ----------------------------------------------------
> // Constructor
>
> Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
> URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java?view=diff&rev=452907&r1=452906&r2=452907
> ==============================================================================
> --- incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java (original)
> +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java Wed Oct 4 08:03:23 2006
> @@ -127,12 +127,11 @@
> boolean isBound = false;
>
> // lock for read and write
> - private final Object readLock = new Object();
> + private class ReadLock {}
> + private final Object readLock = new ReadLock();
>
> - private final Object writeLock = new Object();
> -
> - // lock for status
> - // private final Object statusLock = new Object();
> + private class WriteLock {}
> + private final Object writeLock = new WriteLock();
>
> // this content is a point used to set in connect_withtimeout() in pending
> // mode
>
>
>
--
Tim Ellison (t.p.ellison@gmail.com)
IBM Java technology centre, UK.