Merge

.hgtags

@@ -897,6 +897,8 @@ ac29c9c1193aef5d480b200ed94c5d579243c17b jdk8u102-b14
 96e1c72fc617d3c6c125bcfc9182f77fc6aa38e6 jdk8u102-b31
 c8988d2e4212583ec0f04591c8e241ad3cf95674 jdk8u102-b32
 9050d85e29600400ce4ba2b4db9616388082ae08 jdk8u102-b33
+b678b66d1538af31bac7cf5e74c029395607decd jdk8u102-b34
+8a2db0a6c499250050b59f9a47acd9ea80de92c2 jdk8u102-b35
 ceecf88e5c2c09bfabf5926581e6d0b0f65f5148 jdk8u111-b00
 e73d79ce00e4a0451e464c7a73d9c911d01e169a jdk8u111-b01
 d584a614818562e1187e1a15c202aec01491caeb jdk8u111-b02
@@ -909,6 +911,9 @@ e180e364a40364a059a20c74b97ab4e928e2b676 jdk8u111-b08
 c48b303692bb86c42e928da6dec815e901a24c5b jdk8u111-b09
 96973081eb8a132ca3bfee9249ad99c185b6b130 jdk8u111-b10
 603804f2132ff188a9f3d1c31cca63b47220e2e2 jdk8u111-b11
+055bc2a065a503e8714ff7ad27e6197dc0339efa jdk8u111-b12
+c3b42c43c230f10e79ae850ee9062fe86d3c75c9 jdk8u111-b13
+05a6a5823aa58a0a4720a328a9db484f21d573bc jdk8u111-b14
 b09a69142dd3bf78ca66bb0c99046ca7cccbdda9 jdk8u112-b00
 cf1faa9100dd8c8df6e1a604aaf613d037f51ebf jdk8u112-b01
 f22b5be95347c669a1463d9e05ec3bf11420208e jdk8u112-b02
@@ -921,6 +926,10 @@ c171546c49b5ff57bcb74bb54e8860647f83f268 jdk8u112-b04
 2de719469e959ae1f7bd4fd64af8470f1d03d3bb jdk8u112-b10
 c2ca4df6580822835f3b21436b79e123910c4eb5 jdk8u112-b11
 44dcadfb9e7038a1ae288a99a728526ed97d2b7c jdk8u112-b12
+7bc1061f52cfc5ce4cbfd42dd2dcdc91e7efce72 jdk8u112-b13
+c2c4db2a42a215c98a4f027edb8bbb00dd62d9b9 jdk8u112-b14
+b28d012a24cab8f4ceeee0c9d3252969757423ed jdk8u112-b15
+e134dc1879b72124e478be01680b0646a2fbf585 jdk8u112-b16
 3b0e5f01891f5ebbf67797b1aae786196f1bb4f6 jdk8u121-b00
 251a2493b1857f2ff4f11eab2dfd8b2fe8ed441b jdk8u121-b01
 70c4a50f576a01ec975d0a02b3642ee33db39ed8 jdk8u121-b02

src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp

 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,8 +148,10 @@ void G1ParScanThreadState::trim_queue() {
   do {
     // Drain the overflow stack first, so other threads can steal.
     while (_refs->pop_overflow(ref)) {
+      if (!_refs->try_push_to_taskqueue(ref)) {
         dispatch_reference(ref);
       }
+    }
 
     while (_refs->pop_local(ref)) {
       dispatch_reference(ref);

src/share/vm/utilities/taskqueue.hpp

 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -453,6 +453,9 @@ public:
   // Push task t onto the queue or onto the overflow stack.  Return true.
   inline bool push(E t);
 
+  // Try to push task t onto the queue only. Returns true if successful, false otherwise.
+  inline bool try_push_to_taskqueue(E t);
+
   // Attempt to pop from the overflow stack; return true if anything was popped.
   inline bool pop_overflow(E& t);
 
@@ -486,6 +489,10 @@ bool OverflowTaskQueue<E, F, N>::pop_overflow(E& t)
   return true;
 }
 
+template <class E, MEMFLAGS F, unsigned int N>
+bool OverflowTaskQueue<E, F, N>::try_push_to_taskqueue(E t) {
+  return taskqueue_t::push(t);
+}
 class TaskQueueSetSuper {
 protected:
   static int randomParkAndMiller(int* seed0);