1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Jan 19 13:04:37 2011 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Jan 19 19:30:42 2011 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -25,7 +25,7 @@
1.11 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP
1.12 #define SHARE_VM_GC_IMPLEMENTATION_G1_CONCURRENTMARK_HPP
1.13
1.14 -#include "gc_implementation/g1/heapRegion.hpp"
1.15 +#include "gc_implementation/g1/heapRegionSets.hpp"
1.16 #include "utilities/taskqueue.hpp"
1.17
1.18 class G1CollectedHeap;
1.19 @@ -369,13 +369,7 @@
1.20 double _cleanup_sleep_factor;
1.21 double _cleanup_task_overhead;
1.22
1.23 - // Stuff related to age cohort processing.
1.24 - struct ParCleanupThreadState {
1.25 - char _pre[64];
1.26 - UncleanRegionList list;
1.27 - char _post[64];
1.28 - };
1.29 - ParCleanupThreadState** _par_cleanup_thread_state;
1.30 + FreeRegionList _cleanup_list;
1.31
1.32 // CMS marking support structures
1.33 CMBitMap _markBitMap1;
1.34 @@ -484,6 +478,10 @@
1.35 // prints all gathered CM-related statistics
1.36 void print_stats();
1.37
1.38 + bool cleanup_list_is_empty() {
1.39 + return _cleanup_list.is_empty();
1.40 + }
1.41 +
1.42 // accessor methods
1.43 size_t parallel_marking_threads() { return _parallel_marking_threads; }
1.44 double sleep_factor() { return _sleep_factor; }
