OSDN Git Service

Update concurrent module to Harmony r798021.
authorJesse Wilson <jessewilson@google.com>
Wed, 29 Jul 2009 00:34:57 +0000 (17:34 -0700)
committerJesse Wilson <jessewilson@google.com>
Wed, 29 Jul 2009 00:35:12 +0000 (17:35 -0700)
commit8210fadf25ece2a0db4cd0428d7f27d7166310b9
tree4e333b3f3cf1c7b15908ebecdb328653feb713b9
parent89efc3d632adfa076bd622369b1ad8e4b49cf20e
Update concurrent module to Harmony r798021.

commit 56bcdc2a3b881883409267c3bd16294d80716859
Merge: 903691a f429dca
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Jul 27 17:33:19 2009 -0700

    Merge branch 'concurrent_798021' into concurrent_dalvik

    Conflicts:
     libcore/concurrent/.classpath
     libcore/concurrent/build.xml
     libcore/concurrent/make/run-test.xml
     libcore/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
     libcore/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
     libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
     libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
     libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
     libcore/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
     libcore/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
     libcore/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
     libcore/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
     libcore/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
     libcore/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
     libcore/concurrent/src/main/java/java/util/concurrent/Semaphore.java
     libcore/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
     libcore/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
     libcore/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
     libcore/concurrent/src/main/java/java/util/concurrent/atomic/package.html
     libcore/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
     libcore/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java
     libcore/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
     libcore/concurrent/src/main/java/java/util/concurrent/locks/package.html
     libcore/concurrent/src/main/java/java/util/concurrent/package.html
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java
     libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java

commit 903691ae71cff640d5487a3d34a20e8767dbfb66
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Jul 27 16:09:58 2009 -0700

    Dalvik Concurrent

commit f429dca21c408ee62e688f60d5e110718374e944
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Jul 27 16:08:25 2009 -0700

    Concurrent 798021

commit b2c76fdd1056113000140bc4af57300c87469d2d
Author: Jesse Wilson <jessewilson@google.com>
Date:   Mon Jul 27 16:03:45 2009 -0700

    Concurrent 527399
83 files changed:
libcore/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
libcore/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
libcore/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
libcore/concurrent/src/main/java/java/util/concurrent/CompletionService.java
libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
libcore/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
libcore/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
libcore/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
libcore/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
libcore/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
libcore/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
libcore/concurrent/src/main/java/java/util/concurrent/Delayed.java
libcore/concurrent/src/main/java/java/util/concurrent/Exchanger.java
libcore/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
libcore/concurrent/src/main/java/java/util/concurrent/Executor.java
libcore/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
libcore/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
libcore/concurrent/src/main/java/java/util/concurrent/Executors.java
libcore/concurrent/src/main/java/java/util/concurrent/Future.java
libcore/concurrent/src/main/java/java/util/concurrent/FutureTask.java
libcore/concurrent/src/main/java/java/util/concurrent/Java6Arrays.java [new file with mode: 0644]
libcore/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
libcore/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
libcore/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
libcore/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
libcore/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
libcore/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
libcore/concurrent/src/main/java/java/util/concurrent/Semaphore.java
libcore/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
libcore/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
libcore/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
libcore/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java
libcore/concurrent/src/main/java/java/util/concurrent/atomic/package-info.java [new file with mode: 0644]
libcore/concurrent/src/main/java/java/util/concurrent/atomic/package.html [deleted file]
libcore/concurrent/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java [new file with mode: 0644]
libcore/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
libcore/concurrent/src/main/java/java/util/concurrent/locks/Condition.java
libcore/concurrent/src/main/java/java/util/concurrent/locks/Lock.java
libcore/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java
libcore/concurrent/src/main/java/java/util/concurrent/locks/ReadWriteLock.java
libcore/concurrent/src/main/java/java/util/concurrent/locks/ReentrantLock.java
libcore/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
libcore/concurrent/src/main/java/java/util/concurrent/locks/package-info.java [new file with mode: 0644]
libcore/concurrent/src/main/java/java/util/concurrent/locks/package.html [deleted file]
libcore/concurrent/src/main/java/java/util/concurrent/package-info.java [new file with mode: 0644]
libcore/concurrent/src/main/java/java/util/concurrent/package.html [deleted file]
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java
libcore/concurrent/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java
libcore/dalvik/src/main/java/dalvik/system/VMStack.java
vm/native/dalvik_system_VMStack.c