Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/.hgtags	Mon Oct 03 08:05:21 2016 -0700
     1.2 +++ b/.hgtags	Mon Oct 03 08:13:41 2016 -0700
     1.3 @@ -898,6 +898,7 @@
     1.4  c8988d2e4212583ec0f04591c8e241ad3cf95674 jdk8u102-b32
     1.5  9050d85e29600400ce4ba2b4db9616388082ae08 jdk8u102-b33
     1.6  b678b66d1538af31bac7cf5e74c029395607decd jdk8u102-b34
     1.7 +8a2db0a6c499250050b59f9a47acd9ea80de92c2 jdk8u102-b35
     1.8  ceecf88e5c2c09bfabf5926581e6d0b0f65f5148 jdk8u111-b00
     1.9  e73d79ce00e4a0451e464c7a73d9c911d01e169a jdk8u111-b01
    1.10  d584a614818562e1187e1a15c202aec01491caeb jdk8u111-b02

     2.1 --- a/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	Mon Oct 03 08:05:21 2016 -0700
     2.2 +++ b/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp	Mon Oct 03 08:13:41 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 Oct 03 08:05:21 2016 -0700
     3.2 +++ b/src/share/vm/utilities/taskqueue.hpp	Mon Oct 03 08:13:41 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);