Mercurial > hg > icedtea8-forest > hotspot
changeset 9427:87440ed4e1de jdk8u112-b31
Merge
author | asaha |
---|---|
date | Mon, 03 Oct 2016 08:13:41 -0700 |
parents | 501865c7b781 (current diff) cdd0839491ba (diff) |
children | fa3bb4153a28 10baa7af9e63 |
files | .hgtags |
diffstat | 3 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Oct 03 08:05:21 2016 -0700 +++ b/.hgtags Mon Oct 03 08:13:41 2016 -0700 @@ -898,6 +898,7 @@ c8988d2e4212583ec0f04591c8e241ad3cf95674 jdk8u102-b32 9050d85e29600400ce4ba2b4db9616388082ae08 jdk8u102-b33 b678b66d1538af31bac7cf5e74c029395607decd jdk8u102-b34 +8a2db0a6c499250050b59f9a47acd9ea80de92c2 jdk8u102-b35 ceecf88e5c2c09bfabf5926581e6d0b0f65f5148 jdk8u111-b00 e73d79ce00e4a0451e464c7a73d9c911d01e169a jdk8u111-b01 d584a614818562e1187e1a15c202aec01491caeb jdk8u111-b02
--- a/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp Mon Oct 03 08:05:21 2016 -0700 +++ b/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp Mon Oct 03 08:13:41 2016 -0700 @@ -1,5 +1,5 @@ /* - * 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,7 +148,9 @@ do { // Drain the overflow stack first, so other threads can steal. while (_refs->pop_overflow(ref)) { - dispatch_reference(ref); + if (!_refs->try_push_to_taskqueue(ref)) { + dispatch_reference(ref); + } } while (_refs->pop_local(ref)) {
--- a/src/share/vm/utilities/taskqueue.hpp Mon Oct 03 08:05:21 2016 -0700 +++ b/src/share/vm/utilities/taskqueue.hpp Mon Oct 03 08:13:41 2016 -0700 @@ -1,5 +1,5 @@ /* - * 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 @@ // 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 @@ 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);