changeset 4627:fc4858327ae8

Merge
author dholmes
date Wed, 10 Jul 2013 00:15:41 -0400
parents 25a649574b3b 0d7106aa7e08
children c30107a847a3
files
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/utilities/taskqueue.hpp	Tue Jul 09 17:45:10 2013 -0700
+++ b/src/share/vm/utilities/taskqueue.hpp	Wed Jul 10 00:15:41 2013 -0400
@@ -391,7 +391,14 @@
 template<class E, MEMFLAGS F, unsigned int N>
 bool GenericTaskQueue<E, F, N>::pop_global(E& t) {
   Age oldAge = _age.get();
-  uint localBot = _bottom;
+  // Architectures with weak memory model require a fence here. The
+  // fence has a cumulative effect on getting age and getting bottom.
+  // This way it is guaranteed that bottom is not older than age,
+  // which is crucial for the correctness of the algorithm.
+#if !(defined SPARC || defined IA32 || defined AMD64)
+  OrderAccess::fence();
+#endif
+  uint localBot = OrderAccess::load_acquire((volatile juint*)&_bottom);
   uint n_elems = size(localBot, oldAge.top());
   if (n_elems == 0) {
     return false;
@@ -677,7 +684,7 @@
 template<class E, MEMFLAGS F, unsigned int N> inline bool
 GenericTaskQueue<E, F, N>::push(E t) {
   uint localBot = _bottom;
-  assert((localBot >= 0) && (localBot < N), "_bottom out of range.");
+  assert(localBot < N, "_bottom out of range.");
   idx_t top = _age.top();
   uint dirty_n_elems = dirty_size(localBot, top);
   assert(dirty_n_elems < N, "n_elems out of range.");