1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Dec 21 07:53:53 2011 -0500
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp Wed Dec 14 13:34:57 2011 -0800
1.3 @@ -374,9 +374,9 @@
1.4 protected:
1.5 ConcurrentMarkThread* _cmThread; // the thread doing the work
1.6 G1CollectedHeap* _g1h; // the heap.
1.7 - size_t _parallel_marking_threads; // the number of marking
1.8 + uint _parallel_marking_threads; // the number of marking
1.9 // threads we're use
1.10 - size_t _max_parallel_marking_threads; // max number of marking
1.11 + uint _max_parallel_marking_threads; // max number of marking
1.12 // threads we'll ever use
1.13 double _sleep_factor; // how much we have to sleep, with
1.14 // respect to the work we just did, to
1.15 @@ -412,8 +412,8 @@
1.16 // last claimed region
1.17
1.18 // marking tasks
1.19 - size_t _max_task_num; // maximum task number
1.20 - size_t _active_tasks; // task num currently active
1.21 + uint _max_task_num; // maximum task number
1.22 + uint _active_tasks; // task num currently active
1.23 CMTask** _tasks; // task queue array (max_task_num len)
1.24 CMTaskQueueSet* _task_queues; // task queue set
1.25 ParallelTaskTerminator _terminator; // for termination
1.26 @@ -492,7 +492,7 @@
1.27
1.28 // It should be called to indicate which phase we're in (concurrent
1.29 // mark or remark) and how many threads are currently active.
1.30 - void set_phase(size_t active_tasks, bool concurrent);
1.31 + void set_phase(uint active_tasks, bool concurrent);
1.32 // We do this after we're done with marking so that the marking data
1.33 // structures are initialised to a sensible and predictable state.
1.34 void set_non_marking_state();
1.35 @@ -505,8 +505,8 @@
1.36 }
1.37
1.38 // accessor methods
1.39 - size_t parallel_marking_threads() { return _parallel_marking_threads; }
1.40 - size_t max_parallel_marking_threads() { return _max_parallel_marking_threads;}
1.41 + uint parallel_marking_threads() { return _parallel_marking_threads; }
1.42 + uint max_parallel_marking_threads() { return _max_parallel_marking_threads;}
1.43 double sleep_factor() { return _sleep_factor; }
1.44 double marking_task_overhead() { return _marking_task_overhead;}
1.45 double cleanup_sleep_factor() { return _cleanup_sleep_factor; }
1.46 @@ -514,7 +514,7 @@
1.47
1.48 HeapWord* finger() { return _finger; }
1.49 bool concurrent() { return _concurrent; }
1.50 - size_t active_tasks() { return _active_tasks; }
1.51 + uint active_tasks() { return _active_tasks; }
1.52 ParallelTaskTerminator* terminator() { return &_terminator; }
1.53
1.54 // It claims the next available region to be scanned by a marking
1.55 @@ -715,10 +715,10 @@
1.56 // Returns the number of GC threads to be used in a concurrent
1.57 // phase based on the number of GC threads being used in a STW
1.58 // phase.
1.59 - size_t scale_parallel_threads(size_t n_par_threads);
1.60 + uint scale_parallel_threads(uint n_par_threads);
1.61
1.62 // Calculates the number of GC threads to be used in a concurrent phase.
1.63 - size_t calc_parallel_marking_threads();
1.64 + uint calc_parallel_marking_threads();
1.65
1.66 // The following three are interaction between CM and
1.67 // G1CollectedHeap
1.68 @@ -873,7 +873,7 @@
1.69 return _prevMarkBitMap->isMarked(addr);
1.70 }
1.71
1.72 - inline bool do_yield_check(int worker_i = 0);
1.73 + inline bool do_yield_check(uint worker_i = 0);
1.74 inline bool should_yield();
1.75
1.76 // Called to abort the marking cycle after a Full GC takes palce.
