1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.hpp Thu Mar 03 21:02:56 2011 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.hpp Fri Mar 04 17:13:19 2011 -0500
1.3 @@ -28,8 +28,8 @@
1.4 #include "gc_implementation/g1/heapRegion.hpp"
1.5
1.6 // Large buffer for some cases where the output might be larger than normal.
1.7 -#define HRL_ERR_MSG_BUFSZ 512
1.8 -typedef FormatBuffer<HRL_ERR_MSG_BUFSZ> hrl_err_msg;
1.9 +#define HRS_ERR_MSG_BUFSZ 512
1.10 +typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> hrs_err_msg;
1.11
1.12 // Set verification will be forced either if someone defines
1.13 // HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which
1.14 @@ -45,10 +45,10 @@
1.15 // (e.g., length, region num, used bytes sum) plus any shared
1.16 // functionality (e.g., verification).
1.17
1.18 -class hrl_ext_msg;
1.19 +class hrs_ext_msg;
1.20
1.21 class HeapRegionSetBase VALUE_OBJ_CLASS_SPEC {
1.22 - friend class hrl_ext_msg;
1.23 + friend class hrs_ext_msg;
1.24
1.25 protected:
1.26 static size_t calculate_region_num(HeapRegion* hr);
1.27 @@ -104,10 +104,10 @@
1.28 virtual bool check_mt_safety() { return true; }
1.29
1.30 // fill_in_ext_msg() writes the the values of the set's attributes
1.31 - // in the custom err_msg (hrl_ext_msg). fill_in_ext_msg_extra()
1.32 + // in the custom err_msg (hrs_ext_msg). fill_in_ext_msg_extra()
1.33 // allows subclasses to append further information.
1.34 - virtual void fill_in_ext_msg_extra(hrl_ext_msg* msg) { }
1.35 - void fill_in_ext_msg(hrl_ext_msg* msg, const char* message);
1.36 + virtual void fill_in_ext_msg_extra(hrs_ext_msg* msg) { }
1.37 + void fill_in_ext_msg(hrs_ext_msg* msg, const char* message);
1.38
1.39 // It updates the fields of the set to reflect hr being added to
1.40 // the set.
1.41 @@ -170,9 +170,9 @@
1.42 // the fields of the associated set. This can be very helpful in
1.43 // diagnosing failures.
1.44
1.45 -class hrl_ext_msg : public hrl_err_msg {
1.46 +class hrs_ext_msg : public hrs_err_msg {
1.47 public:
1.48 - hrl_ext_msg(HeapRegionSetBase* set, const char* message) : hrl_err_msg("") {
1.49 + hrs_ext_msg(HeapRegionSetBase* set, const char* message) : hrs_err_msg("") {
1.50 set->fill_in_ext_msg(this, message);
1.51 }
1.52 };
1.53 @@ -180,25 +180,25 @@
1.54 // These two macros are provided for convenience, to keep the uses of
1.55 // these two asserts a bit more concise.
1.56
1.57 -#define hrl_assert_mt_safety_ok(_set_) \
1.58 +#define hrs_assert_mt_safety_ok(_set_) \
1.59 do { \
1.60 - assert((_set_)->check_mt_safety(), hrl_ext_msg((_set_), "MT safety")); \
1.61 + assert((_set_)->check_mt_safety(), hrs_ext_msg((_set_), "MT safety")); \
1.62 } while (0)
1.63
1.64 -#define hrl_assert_region_ok(_set_, _hr_, _expected_) \
1.65 +#define hrs_assert_region_ok(_set_, _hr_, _expected_) \
1.66 do { \
1.67 assert((_set_)->verify_region((_hr_), (_expected_)), \
1.68 - hrl_ext_msg((_set_), "region verification")); \
1.69 + hrs_ext_msg((_set_), "region verification")); \
1.70 } while (0)
1.71
1.72 //////////////////// HeapRegionSet ////////////////////
1.73
1.74 -#define hrl_assert_sets_match(_set1_, _set2_) \
1.75 +#define hrs_assert_sets_match(_set1_, _set2_) \
1.76 do { \
1.77 assert(((_set1_)->regions_humongous() == \
1.78 (_set2_)->regions_humongous()) && \
1.79 ((_set1_)->regions_empty() == (_set2_)->regions_empty()), \
1.80 - hrl_err_msg("the contents of set %s and set %s should match", \
1.81 + hrs_err_msg("the contents of set %s and set %s should match", \
1.82 (_set1_)->name(), (_set2_)->name())); \
1.83 } while (0)
1.84
1.85 @@ -267,7 +267,7 @@
1.86 HeapRegion* tail() { return _tail; }
1.87
1.88 protected:
1.89 - virtual void fill_in_ext_msg_extra(hrl_ext_msg* msg);
1.90 + virtual void fill_in_ext_msg_extra(hrs_ext_msg* msg);
1.91
1.92 // See the comment for HeapRegionSetBase::clear()
1.93 virtual void clear();
1.94 @@ -309,10 +309,10 @@
1.95 virtual void print_on(outputStream* out, bool print_contents = false);
1.96 };
1.97
1.98 -//////////////////// HeapRegionLinkedList ////////////////////
1.99 +//////////////////// HeapRegionLinkedListIterator ////////////////////
1.100
1.101 -// Iterator class that provides a convenient way to iterator over the
1.102 -// regions in a HeapRegionLinkedList instance.
1.103 +// Iterator class that provides a convenient way to iterate over the
1.104 +// regions of a HeapRegionLinkedList instance.
1.105
1.106 class HeapRegionLinkedListIterator : public StackObj {
1.107 private:
