[jboss-cvs] JBossCache/src/org/jboss/cache ...
Manik Surtani
msurtani at jboss.com
Mon Aug 14 13:52:35 EDT 2006
User: msurtani
Date: 06/08/14 13:52:35
Modified: src/org/jboss/cache DataNode.java NodeImpl.java
TreeCache.java TreeCacheProxyImpl.java
TreeNode.java
Log:
Converted NodeLockingScheme, IsolationLevel and LockType to enums
Revision Changes Path
1.16 +2 -9 JBossCache/src/org/jboss/cache/DataNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DataNode.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/DataNode.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- DataNode.java 25 Apr 2006 15:18:28 -0000 1.15
+++ DataNode.java 14 Aug 2006 17:52:35 -0000 1.16
@@ -18,14 +18,7 @@
public interface DataNode extends TreeNode
{
- /** Lock type of none. */
- int LOCK_TYPE_NONE = 0;
-
- /** Lock type of read. */
- int LOCK_TYPE_READ = 1;
-
- /** Lock type of write. */
- int LOCK_TYPE_WRITE = 2;
+ public enum LockType {NONE, READ, WRITE};
/** Initialized property for debugging "print_lock_details" */
boolean PRINT_LOCK_DETAILS = Boolean.getBoolean("print_lock_details");
@@ -35,7 +28,7 @@
* @param lock_acquisition_timeout milliseconds to wait
* @param lockTypeWrite lock type to use
*/
- boolean acquire(Object caller, long lock_acquisition_timeout, int lockTypeWrite)
+ boolean acquire(Object caller, long lock_acquisition_timeout, LockType lockType)
throws InterruptedException, LockingException, TimeoutException;
1.3 +17 -18 JBossCache/src/org/jboss/cache/NodeImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/NodeImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NodeImpl.java 14 Aug 2006 17:20:35 -0000 1.2
+++ NodeImpl.java 14 Aug 2006 17:52:35 -0000 1.3
@@ -7,17 +7,7 @@
package org.jboss.cache;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jboss.cache.factories.NodeFactory;
@@ -29,7 +19,16 @@
import org.jboss.cache.marshall.MethodDeclarations;
import org.jgroups.blocks.MethodCall;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* Basic data node class.
@@ -373,12 +372,12 @@
return n;
}
- public boolean acquire(Object caller, long timeout, int lock_type) throws LockingException, TimeoutException, InterruptedException {
+ public boolean acquire(Object caller, long timeout, DataNode.LockType lock_type) throws LockingException, TimeoutException, InterruptedException {
// Note that we rely on IdentityLock for synchronization
try {
- if(lock_type == LOCK_TYPE_NONE)
+ if(lock_type == DataNode.LockType.NONE)
return true;
- else if(lock_type == LOCK_TYPE_READ)
+ else if(lock_type == DataNode.LockType.READ)
return acquireReadLock(caller, timeout);
else
return acquireWriteLock(caller, timeout);
@@ -434,12 +433,12 @@
return flag;
}
- public Set acquireAll(Object caller, long timeout, int lock_type) throws LockingException, TimeoutException, InterruptedException {
+ public Set acquireAll(Object caller, long timeout, DataNode.LockType lock_type) throws LockingException, TimeoutException, InterruptedException {
DataNode tmp;
boolean acquired;
Set retval=new HashSet();
- if(lock_type == LOCK_TYPE_NONE)
+ if(lock_type == DataNode.LockType.NONE)
return retval;
acquired=acquire(caller, timeout, lock_type);
if(acquired)
@@ -490,7 +489,7 @@
* Serializes this object to ObjectOutput.
* Writes the {@link Fqn} elements, children as a Map, and data as a Map.
* (This is no longer used within JBoss Cache.)
- * @see TreeCacheMarshaller
+ * @see org.jboss.cache.marshall.TreeCacheMarshaller
*/
public void writeExternal(ObjectOutput out) throws IOException {
// DO NOT CHANGE THE WIRE FORMAT OF THIS CLASS!!
1.211 +8 -8 JBossCache/src/org/jboss/cache/TreeCache.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCache.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- TreeCache.java 11 Aug 2006 16:49:49 -0000 1.210
+++ TreeCache.java 14 Aug 2006 17:52:35 -0000 1.211
@@ -73,7 +73,7 @@
* @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
* @author Brian Stansberry
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Id: TreeCache.java,v 1.210 2006/08/11 16:49:49 bstansberry Exp $
+ * @version $Id: TreeCache.java,v 1.211 2006/08/14 17:52:35 msurtani Exp $
* <p/>
* @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
*/
@@ -1197,7 +1197,7 @@
// Lock the parent, create and add the child
try
{
- parent.acquire(owner, configuration.getSyncReplTimeout(), DataNode.LOCK_TYPE_WRITE);
+ parent.acquire(owner, configuration.getSyncReplTimeout(), DataNode.LockType.WRITE);
}
catch (InterruptedException e)
{
@@ -1291,14 +1291,14 @@
{
// Acquire locks
Object owner = getOwnerForLock();
- subtreeRoot.acquireAll(owner, stateFetchTimeout, DataNode.LOCK_TYPE_WRITE);
+ subtreeRoot.acquireAll(owner, stateFetchTimeout, DataNode.LockType.WRITE);
subtreeLocked = true;
// Lock the parent, as we're about to write to it
parent = (DataNode) subtreeRoot.getParent();
if (parent != null)
{
- parent.acquire(owner, stateFetchTimeout, DataNode.LOCK_TYPE_WRITE);
+ parent.acquire(owner, stateFetchTimeout, DataNode.LockType.WRITE);
parentLocked = true;
}
1.9 +2 -2 JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeCacheProxyImpl.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheProxyImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- TreeCacheProxyImpl.java 14 Aug 2006 17:20:35 -0000 1.8
+++ TreeCacheProxyImpl.java 14 Aug 2006 17:52:35 -0000 1.9
@@ -424,7 +424,7 @@
// -----------
// TODO: Think about what we need to do here regarding locking on Nodes
- public boolean acquire(Object owner, long lock_timeout, int lockType) throws InterruptedException
+ public boolean acquire(Object owner, long lock_timeout, DataNode.LockType lockType) throws InterruptedException
{
return currentNode.acquire(owner, lock_timeout, lockType);
}
@@ -434,7 +434,7 @@
return currentNode.getLock();
}
- public Set acquireAll(Object owner, long lock_timeout, int lockType) throws InterruptedException
+ public Set acquireAll(Object owner, long lock_timeout, DataNode.LockType lockType) throws InterruptedException
{
return currentNode.acquireAll(owner, lock_timeout, lockType);
}
1.27 +2 -2 JBossCache/src/org/jboss/cache/TreeNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TreeNode.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeNode.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- TreeNode.java 8 Jun 2006 19:27:21 -0000 1.26
+++ TreeNode.java 14 Aug 2006 17:52:35 -0000 1.27
@@ -31,7 +31,7 @@
* @author Bela Ban March 25 2003
* @author Ben Wang
* @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
- * @version $Revision: 1.26 $
+ * @version $Revision: 1.27 $
*/
public interface TreeNode
@@ -234,7 +234,7 @@
* @see DataNode
* @deprecated Will be removed in JBossCache 1.3.
*/
- Set acquireAll(Object caller, long timeout, int lock_type)
+ Set acquireAll(Object caller, long timeout, DataNode.LockType lock_type)
throws LockingException, TimeoutException, InterruptedException;
/**
More information about the jboss-cvs-commits
mailing list