Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Mon Sep 26 14:36:14 2016 -0700
     1.2 +++ b/.hgtags	Mon Oct 03 08:42:30 2016 -0700
     1.3 @@ -897,6 +897,8 @@
     1.4  96e1c72fc617d3c6c125bcfc9182f77fc6aa38e6 jdk8u102-b31
     1.5  c8988d2e4212583ec0f04591c8e241ad3cf95674 jdk8u102-b32
     1.6  9050d85e29600400ce4ba2b4db9616388082ae08 jdk8u102-b33
     1.7 +b678b66d1538af31bac7cf5e74c029395607decd jdk8u102-b34
     1.8 +8a2db0a6c499250050b59f9a47acd9ea80de92c2 jdk8u102-b35
     1.9  ceecf88e5c2c09bfabf5926581e6d0b0f65f5148 jdk8u111-b00
    1.10  e73d79ce00e4a0451e464c7a73d9c911d01e169a jdk8u111-b01
    1.11  d584a614818562e1187e1a15c202aec01491caeb jdk8u111-b02
    1.12 @@ -909,6 +911,9 @@
    1.13  c48b303692bb86c42e928da6dec815e901a24c5b jdk8u111-b09
    1.14  96973081eb8a132ca3bfee9249ad99c185b6b130 jdk8u111-b10
    1.15  603804f2132ff188a9f3d1c31cca63b47220e2e2 jdk8u111-b11
    1.16 +055bc2a065a503e8714ff7ad27e6197dc0339efa jdk8u111-b12
    1.17 +c3b42c43c230f10e79ae850ee9062fe86d3c75c9 jdk8u111-b13
    1.18 +05a6a5823aa58a0a4720a328a9db484f21d573bc jdk8u111-b14
    1.19  b09a69142dd3bf78ca66bb0c99046ca7cccbdda9 jdk8u112-b00
    1.20  cf1faa9100dd8c8df6e1a604aaf613d037f51ebf jdk8u112-b01
    1.21  f22b5be95347c669a1463d9e05ec3bf11420208e jdk8u112-b02
    1.22 @@ -921,6 +926,10 @@
    1.23  2de719469e959ae1f7bd4fd64af8470f1d03d3bb jdk8u112-b10
    1.24  c2ca4df6580822835f3b21436b79e123910c4eb5 jdk8u112-b11
    1.25  44dcadfb9e7038a1ae288a99a728526ed97d2b7c jdk8u112-b12
    1.26 +7bc1061f52cfc5ce4cbfd42dd2dcdc91e7efce72 jdk8u112-b13
    1.27 +c2c4db2a42a215c98a4f027edb8bbb00dd62d9b9 jdk8u112-b14
    1.28 +b28d012a24cab8f4ceeee0c9d3252969757423ed jdk8u112-b15
    1.29 +e134dc1879b72124e478be01680b0646a2fbf585 jdk8u112-b16
    1.30  3b0e5f01891f5ebbf67797b1aae786196f1bb4f6 jdk8u121-b00
    1.31  251a2493b1857f2ff4f11eab2dfd8b2fe8ed441b jdk8u121-b01
    1.32  70c4a50f576a01ec975d0a02b3642ee33db39ed8 jdk8u121-b02

     2.1 --- a/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	Mon Sep 26 14:36:14 2016 -0700
     2.2 +++ b/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	Mon Oct 03 08:42:30 2016 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -148,7 +148,9 @@
    2.11    do {
    2.12      // Drain the overflow stack first, so other threads can steal.
    2.13      while (_refs->pop_overflow(ref)) {
    2.14 -      dispatch_reference(ref);
    2.15 +      if (!_refs->try_push_to_taskqueue(ref)) {
    2.16 +        dispatch_reference(ref);
    2.17 +      }
    2.18      }
    2.19  
    2.20      while (_refs->pop_local(ref)) {

     3.1 --- a/src/share/vm/utilities/taskqueue.hpp	Mon Sep 26 14:36:14 2016 -0700
     3.2 +++ b/src/share/vm/utilities/taskqueue.hpp	Mon Oct 03 08:42:30 2016 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -453,6 +453,9 @@
    3.11    // Push task t onto the queue or onto the overflow stack.  Return true.
    3.12    inline bool push(E t);
    3.13  
    3.14 +  // Try to push task t onto the queue only. Returns true if successful, false otherwise.
    3.15 +  inline bool try_push_to_taskqueue(E t);
    3.16 +
    3.17    // Attempt to pop from the overflow stack; return true if anything was popped.
    3.18    inline bool pop_overflow(E& t);
    3.19  
    3.20 @@ -486,6 +489,10 @@
    3.21    return true;
    3.22  }
    3.23  
    3.24 +template <class E, MEMFLAGS F, unsigned int N>
    3.25 +bool OverflowTaskQueue<E, F, N>::try_push_to_taskqueue(E t) {
    3.26 +  return taskqueue_t::push(t);
    3.27 +}
    3.28  class TaskQueueSetSuper {
    3.29  protected:
    3.30    static int randomParkAndMiller(int* seed0);