diff options
38 files changed, 112 insertions, 66 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1a457df2005..8e52bc41cfb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,49 @@ +2007-02-20 Gary Benson <gbenson@redhat.com> + + * gnu/awt/xlib/XEventLoop.h: Regenerated. + * gnu/java/awt/peer/gtk/GThreadMutex.h: Likewise. + * gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h: + Likewise. + * gnu/java/rmi/server/UnicastConnectionManager.h: Likewise. + * java/lang/SecurityManager.h: Likewise. + * java/lang/Thread.h: Likewise. + * java/security/VMSecureRandom$Spinner.h: Likewise. + * java/util/concurrent/atomic/AtomicBoolean.h: Likewise. + * java/util/concurrent/atomic/AtomicInteger.h: Likewise. + * java/util/concurrent/atomic/AtomicLong.h: Likewise. + * java/util/concurrent/atomic/AtomicReference.h: Likewise. + * java/util/concurrent/ConcurrentHashMap$HashEntry.h: Likewise. + * java/util/concurrent/ConcurrentHashMap$Segment.h: Likewise. + * java/util/concurrent/ConcurrentLinkedQueue.h: Likewise. + * java/util/concurrent/ConcurrentLinkedQueue$Node.h: Likewise. + * java/util/concurrent/ConcurrentSkipListMap.h: Likewise. + * java/util/concurrent/ConcurrentSkipListMap$Index.h: Likewise. + * java/util/concurrent/ConcurrentSkipListMap$Node.h: Likewise. + * java/util/concurrent/Exchanger.h: Likewise. + * java/util/concurrent/Exchanger$Node.h: Likewise. + * java/util/concurrent/FutureTask$Sync.h: Likewise. + * java/util/concurrent/LinkedBlockingQueue$Node.h: Likewise. + * java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h: + Likewise. + * java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h: + Likewise. + * java/util/concurrent/locks/AbstractQueuedSynchronizer.h: Likewise. + * java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h: + Likewise. + * java/util/concurrent/ScheduledThreadPoolExecutor.h: Likewise. + * java/util/concurrent/SynchronousQueue.h: Likewise. + * java/util/concurrent/SynchronousQueue$TransferQueue.h: Likewise. + * java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h: + Likewise. + * java/util/concurrent/SynchronousQueue$TransferStack.h: Likewise. + * java/util/concurrent/SynchronousQueue$TransferStack$SNode.h: + Likewise. + * java/util/concurrent/ThreadPoolExecutor.h: Likewise. + * java/util/concurrent/ThreadPoolExecutor$Worker.h: Likewise. + * java/util/logging/ErrorManager.h: Likewise. + * javax/swing/plaf/basic/BasicSpinnerUI$2.h: Likewise. + * javax/swing/plaf/basic/BasicSpinnerUI$4.h: Likewise. + 2007-02-16 Keith Seitz <keiths@redhat.com> * gnu/classpath/jdwp/natVMVirtualMachine.cc diff --git a/libjava/gnu/awt/xlib/XEventLoop.h b/libjava/gnu/awt/xlib/XEventLoop.h index 8061e9a9441..0827f8aaa9a 100644 --- a/libjava/gnu/awt/xlib/XEventLoop.h +++ b/libjava/gnu/awt/xlib/XEventLoop.h @@ -67,7 +67,7 @@ private: ::java::lang::Thread * eventLoopThread; public: // actually package-private ::gnu::awt::LightweightRedirector * lightweightRedirector; - jboolean volatile idle; + volatile jboolean idle; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h index c788e827531..9380a5dda27 100644 --- a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h +++ b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h @@ -32,7 +32,7 @@ class gnu::java::awt::peer::gtk::GThreadMutex : public ::java::lang::Object public: // actually package-private GThreadMutex(); - jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers; + volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers; ::java::lang::Object * lockForPotentialLockers; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h b/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h index 664fc4e121c..9b98afc9e13 100644 --- a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h +++ b/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h @@ -36,7 +36,7 @@ public: // actually package-private virtual void exit(); private: ::gnu::java::rmi::server::UnicastConnection * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) conn; - jboolean volatile exiting; + volatile jboolean exiting; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h b/libjava/gnu/java/rmi/server/UnicastConnectionManager.h index 26c19ccc2ba..dd6b828317d 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.h @@ -70,7 +70,7 @@ public: // actually package-private static ::java::util::Hashtable * clients; ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) connections; private: - ::java::lang::Thread * volatile serverThread; + volatile ::java::lang::Thread * serverThread; ::java::net::ServerSocket * ssock; public: // actually package-private ::java::lang::String * serverName; diff --git a/libjava/java/lang/SecurityManager.h b/libjava/java/lang/SecurityManager.h index 8abaa6a7e08..28ef484c3ce 100644 --- a/libjava/java/lang/SecurityManager.h +++ b/libjava/java/lang/SecurityManager.h @@ -74,7 +74,7 @@ public: virtual ::java::lang::ThreadGroup * getThreadGroup(); public: // actually package-private virtual void checkPackageList(::java::lang::String *, ::java::lang::String *, ::java::lang::String *); - static ::java::lang::SecurityManager * volatile current; + static volatile ::java::lang::SecurityManager * current; public: // actually protected jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCheck; public: diff --git a/libjava/java/lang/Thread.h b/libjava/java/lang/Thread.h index b9116b1aad2..e9cf9216100 100644 --- a/libjava/java/lang/Thread.h +++ b/libjava/java/lang/Thread.h @@ -147,7 +147,7 @@ public: // actually package-private ::java::lang::Object * accessControlState; ::gnu::gcj::RawData * interp_frame; ::gnu::gcj::RawData * frame; - jint volatile state; + volatile jint state; ::gnu::gcj::RawDataManaged * data; public: static ::java::lang::Class class$; diff --git a/libjava/java/security/VMSecureRandom$Spinner.h b/libjava/java/security/VMSecureRandom$Spinner.h index 0013a3fc8ca..32a1e31acdf 100644 --- a/libjava/java/security/VMSecureRandom$Spinner.h +++ b/libjava/java/security/VMSecureRandom$Spinner.h @@ -29,8 +29,8 @@ private: void stop(); public: // actually package-private static void access$0(::java::security::VMSecureRandom$Spinner *); - jbyte volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; - jboolean volatile running; + volatile jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; + volatile jboolean running; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h b/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h index 2667ed07c5b..730394d1c23 100644 --- a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h +++ b/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h @@ -18,7 +18,7 @@ public: // actually package-private static JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * newArray(jint); ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key; jint hash; - ::java::lang::Object * volatile value; + volatile ::java::lang::Object * value; ::java::util::concurrent::ConcurrentHashMap$HashEntry * next; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h b/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h index 55d06e8698f..aaa2a7ae10d 100644 --- a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h +++ b/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h @@ -31,10 +31,10 @@ public: // actually package-private private: static const jlong serialVersionUID = 2249069246763182397LL; public: // actually package-private - jint volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::ReentrantLock)))) count; + volatile jint __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::ReentrantLock)))) count; jint modCount; jint threshold; - JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * volatile table; + volatile JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * table; jfloat loadFactor; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h index af69ba60a4e..60fee41a4d0 100644 --- a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h +++ b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h @@ -21,8 +21,8 @@ public: // actually package-private virtual jboolean casNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *, ::java::util::concurrent::ConcurrentLinkedQueue$Node *); virtual void setNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *); private: - ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; - ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile next; + volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; + volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * next; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater; public: diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue.h index 512bc0e0736..281690e36fb 100644 --- a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h +++ b/libjava/java/util/concurrent/ConcurrentLinkedQueue.h @@ -34,8 +34,8 @@ private: static const jlong serialVersionUID = 196745693267521676LL; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater; - ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) head; - ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile tail; + volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) head; + volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * tail; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h index 629cff881e9..c71b25bd327 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h @@ -19,7 +19,7 @@ public: // actually package-private virtual jboolean unlink(::java::util::concurrent::ConcurrentSkipListMap$Index *); ::java::util::concurrent::ConcurrentSkipListMap$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node; ::java::util::concurrent::ConcurrentSkipListMap$Index * down; - ::java::util::concurrent::ConcurrentSkipListMap$Index * volatile right; + volatile ::java::util::concurrent::ConcurrentSkipListMap$Index * right; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * rightUpdater; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h index c9d5d890d1c..1b94c359071 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h @@ -23,8 +23,8 @@ public: // actually package-private ::java::lang::Object * getValidValue(); ::java::util::AbstractMap$SimpleImmutableEntry * createSnapshot(); ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key; - ::java::lang::Object * volatile value; - ::java::util::concurrent::ConcurrentSkipListMap$Node * volatile next; + volatile ::java::lang::Object * value; + volatile ::java::util::concurrent::ConcurrentSkipListMap$Node * next; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * valueUpdater; public: diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap.h index be9beb80ca9..4d42f54688a 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap.h @@ -118,7 +118,7 @@ private: static const jlong serialVersionUID = -8627078645895051609LL; static ::java::util::Random * seedGenerator; static ::java::lang::Object * BASE_HEADER; - ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) head; + volatile ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) head; ::java::util::Comparator * comparator__; jint randomSeed; ::java::util::concurrent::ConcurrentSkipListMap$KeySet * keySet__; diff --git a/libjava/java/util/concurrent/Exchanger$Node.h b/libjava/java/util/concurrent/Exchanger$Node.h index 4bd3890eac8..5e1087b7611 100644 --- a/libjava/java/util/concurrent/Exchanger$Node.h +++ b/libjava/java/util/concurrent/Exchanger$Node.h @@ -14,7 +14,7 @@ class java::util::concurrent::Exchanger$Node : public ::java::util::concurrent:: public: Exchanger$Node(::java::lang::Object *); ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicReference)))) item; - ::java::lang::Thread * volatile waiter; + volatile ::java::lang::Thread * waiter; static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/Exchanger.h b/libjava/java/util/concurrent/Exchanger.h index 5a0993e2656..5ed4d252a90 100644 --- a/libjava/java/util/concurrent/Exchanger.h +++ b/libjava/java/util/concurrent/Exchanger.h @@ -33,7 +33,7 @@ private: static jint TIMED_SPINS; static ::java::lang::Object * CANCEL; static ::java::lang::Object * NULL_ITEM; - JArray< ::java::util::concurrent::Exchanger$Slot * > * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) arena; + volatile JArray< ::java::util::concurrent::Exchanger$Slot * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) arena; ::java::util::concurrent::atomic::AtomicInteger * max; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/FutureTask$Sync.h b/libjava/java/util/concurrent/FutureTask$Sync.h index edaa1cad7bd..18808697181 100644 --- a/libjava/java/util/concurrent/FutureTask$Sync.h +++ b/libjava/java/util/concurrent/FutureTask$Sync.h @@ -36,7 +36,7 @@ private: ::java::util::concurrent::Callable * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractQueuedSynchronizer)))) callable; ::java::lang::Object * result; ::java::lang::Throwable * exception; - ::java::lang::Thread * volatile runner; + volatile ::java::lang::Thread * runner; public: // actually package-private ::java::util::concurrent::FutureTask * this$0; public: diff --git a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h b/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h index 1cf8cda9db8..36d1f654a64 100644 --- a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h +++ b/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h @@ -13,7 +13,7 @@ class java::util::concurrent::LinkedBlockingQueue$Node : public ::java::lang::Ob public: // actually package-private LinkedBlockingQueue$Node(::java::lang::Object *); - ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; + volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; ::java::util::concurrent::LinkedBlockingQueue$Node * next; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h index 8e651b36a53..e01b42074bf 100644 --- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h +++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h @@ -45,8 +45,8 @@ public: // actually package-private static ::java::util::concurrent::atomic::AtomicLong * access$0(); static ::java::util::concurrent::BlockingQueue * access$1(::java::util::concurrent::ScheduledThreadPoolExecutor *); private: - jboolean volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::ThreadPoolExecutor)))) continueExistingPeriodicTasksAfterShutdown; - jboolean volatile executeExistingDelayedTasksAfterShutdown; + volatile jboolean __attribute__((aligned(__alignof__( ::java::util::concurrent::ThreadPoolExecutor)))) continueExistingPeriodicTasksAfterShutdown; + volatile jboolean executeExistingDelayedTasksAfterShutdown; static ::java::util::concurrent::atomic::AtomicLong * sequencer; static jlong NANO_ORIGIN; public: diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h index 105c64e6659..07486a9abf8 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h @@ -18,9 +18,9 @@ public: // actually package-private void tryCancel(::java::lang::Object *); jboolean isCancelled(); jboolean isOffList(); - ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; - ::java::lang::Object * volatile item; - ::java::lang::Thread * volatile waiter; + volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; + volatile ::java::lang::Object * item; + volatile ::java::lang::Thread * waiter; jboolean isData; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater; diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h index 921c36377f7..d1b55c99983 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h @@ -19,9 +19,9 @@ public: // actually package-private ::java::lang::Object * transfer(::java::lang::Object *, jboolean, jlong); ::java::lang::Object * awaitFulfill(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::lang::Object *, jboolean, jlong); void clean(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *); - ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; - ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile tail; - ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile cleanMe; + volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; + volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * tail; + volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * cleanMe; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * cleanMeUpdater; diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h index 48e22f2a68d..77af8cb17f4 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h @@ -17,9 +17,9 @@ public: // actually package-private jboolean tryMatch(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *); void tryCancel(); jboolean isCancelled(); - ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; - ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile match; - ::java::lang::Thread * volatile waiter; + volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; + volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * match; + volatile ::java::lang::Thread * waiter; ::java::lang::Object * item; jint mode; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h index 5722c419bf4..b29138fede4 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h @@ -23,7 +23,7 @@ public: // actually package-private static const jint REQUEST = 0; static const jint DATA = 1; static const jint FULFILLING = 2; - ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; + volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/SynchronousQueue.h b/libjava/java/util/concurrent/SynchronousQueue.h index 7606ddcfe49..82ecce492c1 100644 --- a/libjava/java/util/concurrent/SynchronousQueue.h +++ b/libjava/java/util/concurrent/SynchronousQueue.h @@ -47,7 +47,7 @@ public: // actually package-private static jint maxUntimedSpins; static const jlong spinForTimeoutThreshold = 1000LL; private: - ::java::util::concurrent::SynchronousQueue$Transferer * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) transferer; + volatile ::java::util::concurrent::SynchronousQueue$Transferer * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) transferer; ::java::util::concurrent::locks::ReentrantLock * qlock; ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingProducers; ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingConsumers; diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h b/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h index a1b5dc3feee..18d3f3204a3 100644 --- a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h +++ b/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h @@ -24,7 +24,7 @@ private: ::java::util::concurrent::locks::ReentrantLock * __attribute__((aligned(__alignof__( ::java::lang::Object)))) runLock; ::java::lang::Runnable * firstTask; public: // actually package-private - jlong volatile completedTasks; + volatile jlong completedTasks; ::java::lang::Thread * thread; ::java::util::concurrent::ThreadPoolExecutor * this$0; public: diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor.h b/libjava/java/util/concurrent/ThreadPoolExecutor.h index b69b1f65599..00b9dde7c9f 100644 --- a/libjava/java/util/concurrent/ThreadPoolExecutor.h +++ b/libjava/java/util/concurrent/ThreadPoolExecutor.h @@ -71,20 +71,20 @@ private: ::java::util::concurrent::locks::ReentrantLock * mainLock; ::java::util::concurrent::locks::Condition * termination; ::java::util::HashSet * workers; - jlong volatile keepAliveTime; - jboolean volatile allowCoreThreadTimeOut__; - jint volatile corePoolSize; - jint volatile maximumPoolSize; - jint volatile poolSize; + volatile jlong keepAliveTime; + volatile jboolean allowCoreThreadTimeOut__; + volatile jint corePoolSize; + volatile jint maximumPoolSize; + volatile jint poolSize; public: // actually package-private - jint volatile runState; + volatile jint runState; static const jint RUNNING = 0; static const jint SHUTDOWN = 1; static const jint STOP = 2; static const jint TERMINATED = 3; private: - ::java::util::concurrent::RejectedExecutionHandler * volatile handler; - ::java::util::concurrent::ThreadFactory * volatile threadFactory; + volatile ::java::util::concurrent::RejectedExecutionHandler * handler; + volatile ::java::util::concurrent::ThreadFactory * threadFactory; jint largestPoolSize; jlong completedTaskCount; static ::java::util::concurrent::RejectedExecutionHandler * defaultHandler; diff --git a/libjava/java/util/concurrent/atomic/AtomicBoolean.h b/libjava/java/util/concurrent/atomic/AtomicBoolean.h index 60d22a952ae..08a6d597e14 100644 --- a/libjava/java/util/concurrent/atomic/AtomicBoolean.h +++ b/libjava/java/util/concurrent/atomic/AtomicBoolean.h @@ -35,7 +35,7 @@ private: static const jlong serialVersionUID = 4654671469794556979LL; static ::sun::misc::Unsafe * unsafe; static jlong valueOffset; - jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; + volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/atomic/AtomicInteger.h b/libjava/java/util/concurrent/atomic/AtomicInteger.h index 136a578b514..286aff1d003 100644 --- a/libjava/java/util/concurrent/atomic/AtomicInteger.h +++ b/libjava/java/util/concurrent/atomic/AtomicInteger.h @@ -45,7 +45,7 @@ private: static const jlong serialVersionUID = 6214790243416807050LL; static ::sun::misc::Unsafe * unsafe; static jlong valueOffset; - jint volatile __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; + volatile jint __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/atomic/AtomicLong.h b/libjava/java/util/concurrent/atomic/AtomicLong.h index 0d0c3b00f3e..c70a4e6d839 100644 --- a/libjava/java/util/concurrent/atomic/AtomicLong.h +++ b/libjava/java/util/concurrent/atomic/AtomicLong.h @@ -49,7 +49,7 @@ private: public: // actually package-private static jboolean VM_SUPPORTS_LONG_CAS; private: - jlong volatile __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; + volatile jlong __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/atomic/AtomicReference.h b/libjava/java/util/concurrent/atomic/AtomicReference.h index 363fca6ea10..e8862e8433f 100644 --- a/libjava/java/util/concurrent/atomic/AtomicReference.h +++ b/libjava/java/util/concurrent/atomic/AtomicReference.h @@ -35,7 +35,7 @@ private: static const jlong serialVersionUID = -1848883965231344442LL; static ::sun::misc::Unsafe * unsafe; static jlong valueOffset; - ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; + volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h index 0976920620f..423f2a06356 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h @@ -22,10 +22,10 @@ public: // actually package-private static const jint CONDITION = -2; static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * SHARED; static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * EXCLUSIVE; - jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; - ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile prev; - ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile next; - ::java::lang::Thread * volatile thread; + volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; + volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * prev; + volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * next; + volatile ::java::lang::Thread * thread; ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * nextWaiter; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h index 41f1f7cba88..1e95c3d34b8 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h @@ -97,9 +97,9 @@ public: // actually package-private static void access$0(); private: static const jlong serialVersionUID = 7373984972572414692LL; - ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; - ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile tail; - jlong volatile state; + volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; + volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * tail; + volatile jlong state; public: // actually package-private static const jlong spinForTimeoutThreshold = 1000LL; private: diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h index cc49550577d..0abbb8fd23a 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h @@ -22,10 +22,10 @@ public: // actually package-private static const jint CONDITION = -2; static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * SHARED; static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * EXCLUSIVE; - jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; - ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile prev; - ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile next; - ::java::lang::Thread * volatile thread; + volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; + volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * prev; + volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * next; + volatile ::java::lang::Thread * thread; ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * nextWaiter; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h index e50fcef61af..fc2b9df033d 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h @@ -97,9 +97,9 @@ public: // actually package-private static void access$0(); private: static const jlong serialVersionUID = 7373984972572414691LL; - ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; - ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile tail; - jint volatile state; + volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; + volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * tail; + volatile jint state; public: // actually package-private static const jlong spinForTimeoutThreshold = 1000LL; private: diff --git a/libjava/java/util/logging/ErrorManager.h b/libjava/java/util/logging/ErrorManager.h index 58d48c9e2a8..e6c115e29d8 100644 --- a/libjava/java/util/logging/ErrorManager.h +++ b/libjava/java/util/logging/ErrorManager.h @@ -21,7 +21,7 @@ public: static const jint OPEN_FAILURE = 4; static const jint FORMAT_FAILURE = 5; private: - jboolean volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) everUsed; + volatile jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) everUsed; public: static ::java::lang::Class class$; }; diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h index 2b6cc2a134e..5d8697b83c5 100644 --- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h +++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h @@ -46,7 +46,7 @@ public: void mouseReleased(::java::awt::event::MouseEvent *); public: // actually package-private void increment(); - jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; + volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; ::javax::swing::Timer * timer; ::javax::swing::plaf::basic::BasicSpinnerUI * this$0; public: diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h index c6e68952cb6..0d9dddce85a 100644 --- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h +++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h @@ -46,7 +46,7 @@ public: void mouseReleased(::java::awt::event::MouseEvent *); public: // actually package-private void decrement(); - jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; + volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; ::javax::swing::Timer * timer; ::javax::swing::plaf::basic::BasicSpinnerUI * this$0; public: |
