truffle: src/share/vm/memory/referenceProcessor.cpp comparison

comparison src/share/vm/memory/referenceProcessor.cpp @ 4728:441e946dc1af

7121618: Change type of number of GC workers to unsigned int. Summary: Change variables representing the number of GC workers to uint from int and size_t. Change the parameter in work(int i) to work(uint worker_id). Reviewed-by: brutisso, tonyp

author	jmasa
date	Wed, 14 Dec 2011 13:34:57 -0800
parents	e7dead7e90af
children	d2a62e0f25eb

comparison

equal deleted inserted replaced

-:67fdcb391461
+:441e946dc1af
 _discovering_refs = true;
 }
 ReferenceProcessor::ReferenceProcessor(MemRegion span,
 bool      mt_processing,
-int       mt_processing_degree,
+uint      mt_processing_degree,
 bool      mt_discovery,
-int       mt_discovery_degree,
+uint      mt_discovery_degree,
 bool      atomic_discovery,
 BoolObjectClosure* is_alive_non_header,
 bool      discovered_list_needs_barrier)  :
 _discovering_refs(false),
 _enqueuing_is_done(false),
 _next_id(0)
 {
 _span = span;
 _discovery_is_atomic = atomic_discovery;
 _discovery_is_mt     = mt_discovery;
-_num_q               = MAX2(1, mt_processing_degree);
+_num_q               = MAX2(1U, mt_processing_degree);
 _max_num_q           = MAX2(_num_q, mt_discovery_degree);
 _discovered_refs     = NEW_C_HEAP_ARRAY(DiscoveredList,
 _max_num_q * number_of_subclasses_of_ref());
 if (_discovered_refs == NULL) {
 vm_exit_during_initialization("Could not allocated RefProc Array");
 _discoveredWeakRefs    = &_discoveredSoftRefs[_max_num_q];
 _discoveredFinalRefs   = &_discoveredWeakRefs[_max_num_q];
 _discoveredPhantomRefs = &_discoveredFinalRefs[_max_num_q];
 // Initialize all entries to NULL
-for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
 _discovered_refs[i].set_head(NULL);
 _discovered_refs[i].set_length(0);
 }
 // If we do barriers, cache a copy of the barrier set.
 }
 #ifndef PRODUCT
 void ReferenceProcessor::verify_no_references_recorded() {
 guarantee(!_discovering_refs, "Discovering refs?");
-for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
 guarantee(_discovered_refs[i].is_empty(),
 "Found non-empty discovered list");
 }
 }
 #endif
 void ReferenceProcessor::weak_oops_do(OopClosure* f) {
-for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
 if (UseCompressedOops) {
 f->do_oop((narrowOop*)_discovered_refs[i].adr_head());
 } else {
 f->do_oop((oop*)_discovered_refs[i].adr_head());
 }
 RefProcEnqueueTask tsk(*this, _discovered_refs,
 pending_list_addr, _max_num_q);
 task_executor->execute(tsk);
 } else {
 // Serial code: call the parent class's implementation
-for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
 enqueue_discovered_reflist(_discovered_refs[i], pending_list_addr);
 _discovered_refs[i].set_head(NULL);
 _discovered_refs[i].set_length(0);
 }
 }
 clear_discovered_references(refs_list);
 }
 void ReferenceProcessor::abandon_partial_discovery() {
 // loop over the lists
-for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
 if (TraceReferenceGC && PrintGCDetails && ((i % _max_num_q) == 0)) {
 gclog_or_tty->print_cr("\nAbandoning %s discovered list", list_name(i));
 }
 abandon_partial_discovered_list(_discovered_refs[i]);
 }
 size_t total_refs = 0;
 if (TraceReferenceGC && PrintGCDetails) {
 gclog_or_tty->print_cr("\nBalance ref_lists ");
 }
-for (int i = 0; i < _max_num_q; ++i) {
+for (uint i = 0; i < _max_num_q; ++i) {
 total_refs += ref_lists[i].length();
 if (TraceReferenceGC && PrintGCDetails) {
 gclog_or_tty->print("%d ", ref_lists[i].length());
 }
 }
 if (TraceReferenceGC && PrintGCDetails) {
 gclog_or_tty->print_cr(" = %d", total_refs);
 }
 size_t avg_refs = total_refs / _num_q + 1;
-int to_idx = 0;
+uint to_idx = 0;
-for (int from_idx = 0; from_idx < _max_num_q; from_idx++) {
+for (uint from_idx = 0; from_idx < _max_num_q; from_idx++) {
 bool move_all = false;
 if (from_idx >= _num_q) {
 move_all = ref_lists[from_idx].length() > 0;
 }
 while ((ref_lists[from_idx].length() > avg_refs) ||
 }
 }
 }
 #ifdef ASSERT
 size_t balanced_total_refs = 0;
-for (int i = 0; i < _max_num_q; ++i) {
+for (uint i = 0; i < _max_num_q; ++i) {
 balanced_total_refs += ref_lists[i].length();
 if (TraceReferenceGC && PrintGCDetails) {
 gclog_or_tty->print("%d ", ref_lists[i].length());
 }
 }
 must_balance) {
 balance_queues(refs_lists);
 }
 if (PrintReferenceGC && PrintGCDetails) {
 size_t total = 0;
-for (int i = 0; i < _max_num_q; ++i) {
+for (uint i = 0; i < _max_num_q; ++i) {
 total += refs_lists[i].length();
 }
 gclog_or_tty->print(", %u refs", total);
 }
 if (policy != NULL) {
 if (mt_processing) {
 RefProcPhase1Task phase1(*this, refs_lists, policy, true /*marks_oops_alive*/);
 task_executor->execute(phase1);
 } else {
-for (int i = 0; i < _max_num_q; i++) {
+for (uint i = 0; i < _max_num_q; i++) {
 process_phase1(refs_lists[i], policy,
 is_alive, keep_alive, complete_gc);
 }
 }
 } else { // policy == NULL
 // . Traverse the list and remove any refs whose referents are alive.
 if (mt_processing) {
 RefProcPhase2Task phase2(*this, refs_lists, !discovery_is_atomic() /*marks_oops_alive*/);
 task_executor->execute(phase2);
 } else {
-for (int i = 0; i < _max_num_q; i++) {
+for (uint i = 0; i < _max_num_q; i++) {
 process_phase2(refs_lists[i], is_alive, keep_alive, complete_gc);
 }
 }
 // Phase 3:
 // . Traverse the list and process referents as appropriate.
 if (mt_processing) {
 RefProcPhase3Task phase3(*this, refs_lists, clear_referent, true /*marks_oops_alive*/);
 task_executor->execute(phase3);
 } else {
-for (int i = 0; i < _max_num_q; i++) {
+for (uint i = 0; i < _max_num_q; i++) {
 process_phase3(refs_lists[i], clear_referent,
 is_alive, keep_alive, complete_gc);
 }
 }
 }
 void ReferenceProcessor::clean_up_discovered_references() {
 // loop over the lists
-for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
 if (TraceReferenceGC && PrintGCDetails && ((i % _max_num_q) == 0)) {
 gclog_or_tty->print_cr(
 "\nScrubbing %s discovered list of Null referents",
 list_name(i));
 }
 }
 )
 }
 inline DiscoveredList* ReferenceProcessor::get_discovered_list(ReferenceType rt) {
-int id = 0;
+uint id = 0;
 // Determine the queue index to use for this object.
 if (_discovery_is_mt) {
 // During a multi-threaded discovery phase,
 // each thread saves to its "own" list.
 Thread* thr = Thread::current();
 #endif
 // Soft references
 {
 TraceTime tt("Preclean SoftReferences", PrintGCDetails && PrintReferenceGC,
 false, gclog_or_tty);
-for (int i = 0; i < _max_num_q; i++) {
+for (uint i = 0; i < _max_num_q; i++) {
 if (yield->should_return()) {
 return;
 }
 preclean_discovered_reflist(_discoveredSoftRefs[i], is_alive,
 keep_alive, complete_gc, yield);
 // Weak references
 {
 TraceTime tt("Preclean WeakReferences", PrintGCDetails && PrintReferenceGC,
 false, gclog_or_tty);
-for (int i = 0; i < _max_num_q; i++) {
+for (uint i = 0; i < _max_num_q; i++) {
 if (yield->should_return()) {
 return;
 }
 preclean_discovered_reflist(_discoveredWeakRefs[i], is_alive,
 keep_alive, complete_gc, yield);
 // Final references
 {
 TraceTime tt("Preclean FinalReferences", PrintGCDetails && PrintReferenceGC,
 false, gclog_or_tty);
-for (int i = 0; i < _max_num_q; i++) {
+for (uint i = 0; i < _max_num_q; i++) {
 if (yield->should_return()) {
 return;
 }
 preclean_discovered_reflist(_discoveredFinalRefs[i], is_alive,
 keep_alive, complete_gc, yield);
 // Phantom references
 {
 TraceTime tt("Preclean PhantomReferences", PrintGCDetails && PrintReferenceGC,
 false, gclog_or_tty);
-for (int i = 0; i < _max_num_q; i++) {
+for (uint i = 0; i < _max_num_q; i++) {
 if (yield->should_return()) {
 return;
 }
 preclean_discovered_reflist(_discoveredPhantomRefs[i], is_alive,
 keep_alive, complete_gc, yield);
 iter.removed(), iter.processed(), (address)refs_list.head());
 }
 )
 }
-const char* ReferenceProcessor::list_name(int i) {
+const char* ReferenceProcessor::list_name(uint i) {
 assert(i >= 0 && i <= _max_num_q * number_of_subclasses_of_ref(),
 "Out of bounds index");
 int j = i / _max_num_q;
 switch (j) {
 #endif
 #ifndef PRODUCT
 void ReferenceProcessor::clear_discovered_references() {
 guarantee(!_discovering_refs, "Discovering refs?");
-for (int i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
+for (uint i = 0; i < _max_num_q * number_of_subclasses_of_ref(); i++) {
 clear_discovered_references(_discovered_refs[i]);
 }
 }
 #endif // PRODUCT

Mercurial > hg > truffle

comparison src/share/vm/memory/referenceProcessor.cpp @ 4728:441e946dc1af