archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8138707: TestPromotionEventWithParallelScavenge.java crashes using undefined GC id

Browse source 
Reviewed-by: mgerdin, jwilhelm
This commit is contained in:
Bengt Rutisson 2015-10-06 14:27:03 +02:00
parent 48bbdafeed
commit 3289307dbe
3 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

34
hotspot/src/share/vm/gc/parallel/gcTaskManager.cpp
View file

@ -26,6 +26,7 @@
#include "gc/parallel/gcTaskManager.hpp"
#include "gc/parallel/gcTaskThread.hpp"
#include "gc/shared/adaptiveSizePolicy.hpp"
#include "gc/shared/gcId.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "runtime/mutex.hpp"
@ -61,33 +62,24 @@ const char* GCTask::Kind::to_string(kind value) {
return result;
};
GCTask::GCTask() :
_kind(Kind::ordinary_task),
_affinity(GCTaskManager::sentinel_worker()){
initialize();
GCTask::GCTask() {
initialize(Kind::ordinary_task, GCId::current());
}
GCTask::GCTask(Kind::kind kind) :
_kind(kind),
_affinity(GCTaskManager::sentinel_worker()) {
initialize();
GCTask::GCTask(Kind::kind kind) {
initialize(kind, GCId::current());
}
GCTask::GCTask(uint affinity) :
_kind(Kind::ordinary_task),
_affinity(affinity) {
initialize();
GCTask::GCTask(Kind::kind kind, uint gc_id) {
initialize(kind, gc_id);
}
GCTask::GCTask(Kind::kind kind, uint affinity) :
_kind(kind),
_affinity(affinity) {
initialize();
}
void GCTask::initialize() {
void GCTask::initialize(Kind::kind kind, uint gc_id) {
_kind = kind;
_affinity = GCTaskManager::sentinel_worker();
_older = NULL;
_newer = NULL;
_gc_id = gc_id;
}
void GCTask::destruct() {
@ -806,6 +798,10 @@ void NoopGCTask::destroy(NoopGCTask* that) {
}
}
// This task should never be performing GC work that require
// a valid GC id.
NoopGCTask::NoopGCTask() : GCTask(GCTask::Kind::noop_task, GCId::undefined()) { }
void NoopGCTask::destruct() {
// This has to know it's superclass structure, just like the constructor.
this->GCTask::destruct();