1.1 --- a/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp Tue Apr 08 14:55:16 2014 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp Thu Apr 03 17:49:31 2014 +0400
1.3 @@ -36,7 +36,7 @@
1.4 public:
1.5 // Process the card whose card table entry is "card_ptr". If returns
1.6 // "false", terminate the iteration early.
1.7 - virtual bool do_card_ptr(jbyte* card_ptr, int worker_i = 0) = 0;
1.8 + virtual bool do_card_ptr(jbyte* card_ptr, uint worker_i = 0) = 0;
1.9 };
1.10
1.11 // A ptrQueue whose elements are "oops", pointers to object heads.
1.12 @@ -53,7 +53,7 @@
1.13 // deletes processed entries from logs.
1.14 bool apply_closure(CardTableEntryClosure* cl,
1.15 bool consume = true,
1.16 - size_t worker_i = 0);
1.17 + uint worker_i = 0);
1.18
1.19 // Apply the closure to all elements of "buf", down to "index"
1.20 // (inclusive.) If returns "false", then a closure application returned
1.21 @@ -63,7 +63,7 @@
1.22 static bool apply_closure_to_buffer(CardTableEntryClosure* cl,
1.23 void** buf, size_t index, size_t sz,
1.24 bool consume = true,
1.25 - int worker_i = 0);
1.26 + uint worker_i = 0);
1.27 void **get_buf() { return _buf;}
1.28 void set_buf(void **buf) {_buf = buf;}
1.29 size_t get_index() { return _index;}
1.30 @@ -98,7 +98,7 @@
1.31
1.32 // The number of parallel ids that can be claimed to allow collector or
1.33 // mutator threads to do card-processing work.
1.34 - static size_t num_par_ids();
1.35 + static uint num_par_ids();
1.36
1.37 static void handle_zero_index_for_thread(JavaThread* t);
1.38
1.39 @@ -115,7 +115,7 @@
1.40 // change in the future.) If "consume" is true, processed entries are
1.41 // discarded.
1.42 void iterate_closure_all_threads(bool consume = true,
1.43 - size_t worker_i = 0);
1.44 + uint worker_i = 0);
1.45
1.46 // If there exists some completed buffer, pop it, then apply the
1.47 // registered closure to all its elements, nulling out those elements
1.48 @@ -124,7 +124,7 @@
1.49 // but is only partially completed before a "yield" happens, the
1.50 // partially completed buffer (with its processed elements set to NULL)
1.51 // is returned to the completed buffer set, and this call returns false.
1.52 - bool apply_closure_to_completed_buffer(int worker_i = 0,
1.53 + bool apply_closure_to_completed_buffer(uint worker_i = 0,
1.54 int stop_at = 0,
1.55 bool during_pause = false);
1.56
1.57 @@ -136,13 +136,13 @@
1.58 // partially completed buffer (with its processed elements set to NULL)
1.59 // is returned to the completed buffer set, and this call returns false.
1.60 bool apply_closure_to_completed_buffer(CardTableEntryClosure* cl,
1.61 - int worker_i = 0,
1.62 + uint worker_i = 0,
1.63 int stop_at = 0,
1.64 bool during_pause = false);
1.65
1.66 // Helper routine for the above.
1.67 bool apply_closure_to_completed_buffer_helper(CardTableEntryClosure* cl,
1.68 - int worker_i,
1.69 + uint worker_i,
1.70 BufferNode* nd);
1.71
1.72 BufferNode* get_completed_buffer(int stop_at);
