Changeset 499 for Tests

Timestamp:

03/26/12 19:28:32 (10 years ago)

Author:

BegemoT

Message:

 

Location:

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl

Files:

• ABQBusyWaitQueue.java (modified) (1 diff)
• ABQConditionFreeQueue.java (copied) (copied from Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl/ABQBusyWaitQueue.java) (6 diffs)

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl/ABQBusyWaitQueue.java

@@ -79 +79 @@
     private void backoff( final int turn ) throws InterruptedException {
         Thread.yield();
+
+        /*if ( turn % 10 == 9 ) {
+            Thread.yield();
+        } else {
+            for ( int i = 0; i < turn; i++ ) {
+                if ( Thread.currentThread().isInterrupted() ) {
+                    return;
+                }
+            }
+        }*/
+
         /*final int mod = turn & 0xf;
         if ( mod != 0 ) {

Tests/JAVA/test/src/main/java/test/threads/queue/unstressed/impl/ABQConditionFreeQueue.java

@@ -1 +1 @@
 package test.threads.queue.unstressed.impl;
 
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
 
 import test.threads.queue.unstressed.IBoundedQueueFactory;
@@ -7 +7 @@
 
 /**
- * ABQ with busy-wait instead of parking
+ * ABQ with busy-wait instead of condition-based notification
  *
  * @author cheremin
  * @since 24.03.12,  1:57
  */
-public class ABQBusyWaitQueue<T> implements IQueue<T> {
-    private static final boolean USE_TEST_AND_CAS = false;
+public class ABQConditionFreeQueue<T> implements IQueue<T> {
 
     private static final int FREE = 0;
@@ -26 +25 @@
     private int count = 0;
 
-    private final AtomicInteger owned = new AtomicInteger( FREE );
+    private final ReentrantLock lock = new ReentrantLock();
 
     @SuppressWarnings( "unchecked" )
-    public ABQBusyWaitQueue( final int size ) {
+    public ABQConditionFreeQueue( final int size ) {
         this.items = ( T[] ) new Object[size];
     }
@@ -79 +78 @@
     private void backoff( final int turn ) throws InterruptedException {
         Thread.yield();
+
+        /*if ( turn % 10 == 9 ) {
+            Thread.yield();
+        } else {
+            for ( int i = 0; i < turn; i++ ) {
+                if ( Thread.currentThread().isInterrupted() ) {
+                    return;
+                }
+            }
+        }*/
+
         /*final int mod = turn & 0xf;
         if ( mod != 0 ) {
@@ -92 +102 @@
 
     private void releaseLock() {
-        owned.set( FREE );
+        lock.unlock();
     }
 
     private boolean tryAcquireLock() throws InterruptedException {
-        if ( USE_TEST_AND_CAS && owned.get() != FREE ) {
-            return false;
-        }
-        return owned.compareAndSet( FREE, OWNED );
+        return lock.tryLock();
     }
 
@@ -109 +116 @@
 
     @SuppressWarnings( "unchecked" )
-    public static <T> IBoundedQueueFactory<T, ABQBusyWaitQueue<T>> factory() {
+    public static <T> IBoundedQueueFactory<T, ABQConditionFreeQueue<T>> factory() {
         return FACTORY;
     }
 
-    public static final IBoundedQueueFactory FACTORY = new IBoundedQueueFactory<Object, ABQBusyWaitQueue<Object>>() {
+    public static final IBoundedQueueFactory FACTORY = new IBoundedQueueFactory<Object, ABQConditionFreeQueue<Object>>() {
         @Override
-        public ABQBusyWaitQueue<Object> create( final int size ) {
-            return new ABQBusyWaitQueue<Object>( size );
+        public ABQConditionFreeQueue<Object> create( final int size ) {
+            return new ABQConditionFreeQueue<Object>( size );
         }
 
         @Override
         public String toString() {
-            return "ABQBusyWaitFactory[" + ( USE_TEST_AND_CAS ? "TCAS" : "CAS" ) + "]";
+            return "ABQConditionFreeFactory";
         }
     };