jdk-sandbox: comparison hotspot/src/share/vm/gc/shared/generation.hpp

equal deleted inserted replaced

-:7ed47d0b888a
+:390a27af5657
 size_t num_words;
 HeapWord scratch_space[1];  // Actually, of size "num_words-2" (assuming
 // first two fields are word-sized.)
 };
 class Generation: public CHeapObj<mtGC> {
 friend class VMStructs;
 private:
 jlong _time_of_last_gc; // time when last gc on this generation happened (ms)
 MemRegion _prev_used_region; // for collectors that want to "remember" a value for
 // "word_sz".  If possible, allocate space for "obj", copy obj into it
 // (taking care to copy "m" into the mark word when done, since the mark
 // word of "obj" may have been overwritten with a forwarding pointer, and
 // also taking care to copy the klass pointer *last*.  Returns the new
 // object if successful, or else NULL.
-virtual oop par_promote(int thread_num,
+virtual oop par_promote(int thread_num, oop obj, markOop m, size_t word_sz);
-oop obj, markOop m, size_t word_sz);
 // Informs the current generation that all par_promote_alloc's in the
 // collection have been completed; any supporting data structures can be
 // reset.  Default is to do nothing.
 virtual void par_promote_alloc_done(int thread_num) {}
 // do nothing.
 virtual void par_oop_since_save_marks_iterate_done(int thread_num) {}
 // This generation will collect all younger generations
 // during a full collection.
-virtual bool full_collects_younger_generations() const { return false; }
+virtual bool full_collects_young_generation() const { return false; }
 // This generation does in-place marking, meaning that mark words
 // are mutated during the marking phase and presumably reinitialized
 // to a canonical value after the GC. This is currently used by the
 // biased locking implementation to determine whether additional
 bool is_tlab,
 bool parallel = false) = 0;
 // Some generations may require some cleanup or preparation actions before
 // allowing a collection.  The default is to do nothing.
-virtual void gc_prologue(bool full) {};
+virtual void gc_prologue(bool full) {}
 // Some generations may require some cleanup actions after a collection.
 // The default is to do nothing.
-virtual void gc_epilogue(bool full) {};
+virtual void gc_epilogue(bool full) {}
 // Save the high water marks for the used space in a generation.
-virtual void record_spaces_top() {};
+virtual void record_spaces_top() {}
 // Some generations may need to be "fixed-up" after some allocation
 // activity to make them parsable again. The default is to do nothing.
-virtual void ensure_parsability() {};
+virtual void ensure_parsability() {}
 // Time (in ms) when we were last collected or now if a collection is
 // in progress.
 virtual jlong time_of_last_gc(jlong now) {
 // Both _time_of_last_gc and now are set using a time source
 virtual void prepare_for_compaction(CompactPoint* cp);
 // Mark sweep support phase3
 virtual void adjust_pointers();
 // Mark sweep support phase4
 virtual void compact();
-virtual void post_compact() {ShouldNotReachHere();}
+virtual void post_compact() { ShouldNotReachHere(); }
 // Support for CMS's rescan. In this general form we return a pointer
 // to an abstract object that can be used, based on specific previously
 // decided protocols, to exchange information between generations,
 // information that may be useful for speeding up certain types of
 virtual void* get_data_recorder(int thr_num) { return NULL; }
 virtual void sample_eden_chunk() {}
 // Some generations may require some cleanup actions before allowing
 // a verification.
-virtual void prepare_for_verify() {};
+virtual void prepare_for_verify() {}
 // Accessing "marks".
 // This function gives a generation a chance to note a point between
 // collections.  For example, a contiguous generation might note the
 virtual void contribute_scratch(ScratchBlock*& list, Generation* requestor,
 size_t max_alloc_words) {}
 // Give each generation an opportunity to do clean up for any
 // contributed scratch.
-virtual void reset_scratch() {};
+virtual void reset_scratch() {}
 // When an older generation has been collected, and perhaps resized,
 // this method will be invoked on all younger generations (from older to
 // younger), allowing them to resize themselves as appropriate.
 virtual void compute_new_size() = 0;

changeset 32623	390a27af5657
parent 31358	693058672cc6
child 33205	bc9fec5e7656