提交 0cecb4a8 编写于 作者: J jmasa

7119584: UseParallelGC barrier task can be overwritten.

Summary: Provoke a GC for a metadata allocation failure.
Reviewed-by: johnc, iveresov
上级 8bb317a2
/* /*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -53,6 +53,9 @@ const char* GCTask::Kind::to_string(kind value) { ...@@ -53,6 +53,9 @@ const char* GCTask::Kind::to_string(kind value) {
case noop_task: case noop_task:
result = "noop task"; result = "noop task";
break; break;
case idle_task:
result = "idle task";
break;
} }
return result; return result;
}; };
...@@ -782,6 +785,12 @@ void GCTaskManager::note_release(uint which) { ...@@ -782,6 +785,12 @@ void GCTaskManager::note_release(uint which) {
void GCTaskManager::execute_and_wait(GCTaskQueue* list) { void GCTaskManager::execute_and_wait(GCTaskQueue* list) {
WaitForBarrierGCTask* fin = WaitForBarrierGCTask::create(); WaitForBarrierGCTask* fin = WaitForBarrierGCTask::create();
list->enqueue(fin); list->enqueue(fin);
// The barrier task will be read by one of the GC
// workers once it is added to the list of tasks.
// Be sure that is globally visible before the
// GC worker reads it (which is after the task is added
// to the list of tasks below).
OrderAccess::storestore();
add_list(list); add_list(list);
fin->wait_for(true /* reset */); fin->wait_for(true /* reset */);
// We have to release the barrier tasks! // We have to release the barrier tasks!
...@@ -833,11 +842,15 @@ void NoopGCTask::destruct() { ...@@ -833,11 +842,15 @@ void NoopGCTask::destruct() {
IdleGCTask* IdleGCTask::create() { IdleGCTask* IdleGCTask::create() {
IdleGCTask* result = new IdleGCTask(false); IdleGCTask* result = new IdleGCTask(false);
assert(UseDynamicNumberOfGCThreads,
"Should only be used with dynamic GC thread");
return result; return result;
} }
IdleGCTask* IdleGCTask::create_on_c_heap() { IdleGCTask* IdleGCTask::create_on_c_heap() {
IdleGCTask* result = new(ResourceObj::C_HEAP) IdleGCTask(true); IdleGCTask* result = new(ResourceObj::C_HEAP) IdleGCTask(true);
assert(UseDynamicNumberOfGCThreads,
"Should only be used with dynamic GC thread");
return result; return result;
} }
......
/* /*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -129,6 +129,8 @@ void GCTaskThread::run() { ...@@ -129,6 +129,8 @@ void GCTaskThread::run() {
for (; /* break */; ) { for (; /* break */; ) {
// This will block until there is a task to be gotten. // This will block until there is a task to be gotten.
GCTask* task = manager()->get_task(which()); GCTask* task = manager()->get_task(which());
// Record if this is an idle task for later use.
bool is_idle_task = task->is_idle_task();
// In case the update is costly // In case the update is costly
if (PrintGCTaskTimeStamps) { if (PrintGCTaskTimeStamps) {
timer.update(); timer.update();
...@@ -137,9 +139,13 @@ void GCTaskThread::run() { ...@@ -137,9 +139,13 @@ void GCTaskThread::run() {
jlong entry_time = timer.ticks(); jlong entry_time = timer.ticks();
char* name = task->name(); char* name = task->name();
// If this is the barrier task, it can be destroyed
// by the GC task manager once the do_it() executes.
task->do_it(manager(), which()); task->do_it(manager(), which());
if (!task->is_idle_task()) { // Use the saved value of is_idle_task because references
// using "task" are not reliable for the barrier task.
if (!is_idle_task) {
manager()->note_completion(which()); manager()->note_completion(which());
if (PrintGCTaskTimeStamps) { if (PrintGCTaskTimeStamps) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册