jdk8-mips64-public/hotspot: comparison src/share/vm/gc

-:821269eca479
+:d44bdab1c03d
 // old versions synchronously.
 class SparsePRTEntry: public CHeapObj {
 public:
 enum SomePublicConstants {
-CardsPerEntry = (short)4,
+CardsPerEntry =  4,
-NullEntry = (short)-1,
+NullEntry     = -1
-DeletedEntry = (short)-2
 };
 private:
-short _region_ind;
+RegionIdx_t _region_ind;
-short _next_index;
+int         _next_index;
-short _cards[CardsPerEntry];
+CardIdx_t   _cards[CardsPerEntry];
 public:
 // Set the region_ind to the given value, and delete all cards.
-inline void init(short region_ind);
+inline void init(RegionIdx_t region_ind);
-short r_ind() const { return _region_ind; }
+RegionIdx_t r_ind() const { return _region_ind; }
 bool valid_entry() const { return r_ind() >= 0; }
-void set_r_ind(short rind) { _region_ind = rind; }
+void set_r_ind(RegionIdx_t rind) { _region_ind = rind; }
-short next_index() const { return _next_index; }
+int next_index() const { return _next_index; }
-short* next_index_addr() { return &_next_index; }
+int* next_index_addr() { return &_next_index; }
-void set_next_index(short ni) { _next_index = ni; }
+void set_next_index(int ni) { _next_index = ni; }
 // Returns "true" iff the entry contains the given card index.
-inline bool contains_card(short card_index) const;
+inline bool contains_card(CardIdx_t card_index) const;
 // Returns the number of non-NULL card entries.
 inline int num_valid_cards() const;
 // Requires that the entry not contain the given card index.  If there is
 enum AddCardResult {
 overflow,
 found,
 added
 };
-inline AddCardResult add_card(short card_index);
+inline AddCardResult add_card(CardIdx_t card_index);
 // Copy the current entry's cards into "cards".
-inline void copy_cards(short* cards) const;
+inline void copy_cards(CardIdx_t* cards) const;
 // Copy the current entry's cards into the "_card" array of "e."
 inline void copy_cards(SparsePRTEntry* e) const;
-inline short card(int i) const { return _cards[i]; }
+inline CardIdx_t card(int i) const { return _cards[i]; }
 };
 class RSHashTable : public CHeapObj {
 size_t _capacity_mask;
 size_t _occupied_entries;
 size_t _occupied_cards;
 SparsePRTEntry* _entries;
-short* _buckets;
+int* _buckets;
-short  _free_region;
+int  _free_region;
-short  _free_list;
+int  _free_list;
 static RSHashTable* _head_deleted_list;
 RSHashTable* _next_deleted;
 RSHashTable* next_deleted() { return _next_deleted; }
 void set_next_deleted(RSHashTable* rsht) { _next_deleted = rsht; }
 // Requires that the caller hold a lock preventing parallel modifying
 // operations, and that the the table be less than completely full.  If
 // an entry for "region_ind" is already in the table, finds it and
 // returns its address; otherwise returns "NULL."
-SparsePRTEntry* entry_for_region_ind(short region_ind) const;
+SparsePRTEntry* entry_for_region_ind(RegionIdx_t region_ind) const;
 // Requires that the caller hold a lock preventing parallel modifying
 // operations, and that the the table be less than completely full.  If
 // an entry for "region_ind" is already in the table, finds it and
 // returns its address; otherwise allocates, initializes, inserts and
 // returns a new entry for "region_ind".
-SparsePRTEntry* entry_for_region_ind_create(short region_ind);
+SparsePRTEntry* entry_for_region_ind_create(RegionIdx_t region_ind);
 // Returns the index of the next free entry in "_entries".
-short alloc_entry();
+int alloc_entry();
 // Declares the entry "fi" to be free.  (It must have already been
 // deleted from any bucket lists.
-void free_entry(short fi);
+void free_entry(int fi);
 public:
 RSHashTable(size_t capacity);
 ~RSHashTable();
 // the sparse table.  If successful (because the card was already
 // present, or because it was successfullly added) returns "true".
 // Otherwise, returns "false" to indicate that the addition would
 // overflow the entry for the region.  The caller must transfer these
 // entries to a larger-capacity representation.
-bool add_card(short region_id, short card_index);
+bool add_card(RegionIdx_t region_id, CardIdx_t card_index);
-bool get_cards(short region_id, short* cards);
+bool get_cards(RegionIdx_t region_id, CardIdx_t* cards);
-bool delete_entry(short region_id);
+bool delete_entry(RegionIdx_t region_id);
-bool contains_card(short region_id, short card_index) const;
+bool contains_card(RegionIdx_t region_id, CardIdx_t card_index) const;
 void add_entry(SparsePRTEntry* e);
 void clear();
 void print();
 static void add_to_deleted_list(RSHashTable* rsht);
 static RSHashTable* get_from_deleted_list();
+};
-};
+// ValueObj because will be embedded in HRRS iterator.
-// ValueObj because will be embedded in HRRS iterator.
 class RSHashTableIter VALUE_OBJ_CLASS_SPEC {
-short _tbl_ind;
+int _tbl_ind;         // [-1, 0.._rsht->_capacity)
-short _bl_ind;
+int _bl_ind;          // [-1, 0.._rsht->_capacity)
-short _card_ind;
+short _card_ind;      // [0..CardsPerEntry)
 RSHashTable* _rsht;
 size_t _heap_bot_card_ind;
 enum SomePrivateConstants {
 CardsPerRegion = HeapRegion::GrainBytes >> CardTableModRefBS::card_shift
 };
 // If the bucket list pointed to by _bl_ind contains a card, sets
 // _bl_ind to the index of that entry, and returns the card.
-// Otherwise, returns SparseEntry::NullEnty.
+// Otherwise, returns SparseEntry::NullEntry.
-short find_first_card_in_list();
+CardIdx_t find_first_card_in_list();
-// Computes the proper card index for the card whose offset in the
-// current region (as indicated by _bl_ind) is "ci".
+// Computes the proper card index for the card whose offset in the
-// This is subject to errors when there is iteration concurrent with
+// current region (as indicated by _bl_ind) is "ci".
-// modification, but these errors should be benign.
+// This is subject to errors when there is iteration concurrent with
-size_t compute_card_ind(short ci);
+// modification, but these errors should be benign.
+size_t compute_card_ind(CardIdx_t ci);
-public:
-RSHashTableIter(size_t heap_bot_card_ind) :
+public:
-_tbl_ind(RSHashTable::NullEntry),
+RSHashTableIter(size_t heap_bot_card_ind) :
-_bl_ind(RSHashTable::NullEntry),
+_tbl_ind(RSHashTable::NullEntry),
-_card_ind((SparsePRTEntry::CardsPerEntry-1)),
+_bl_ind(RSHashTable::NullEntry),
-_rsht(NULL),
+_card_ind((SparsePRTEntry::CardsPerEntry-1)),
-_heap_bot_card_ind(heap_bot_card_ind)
+_rsht(NULL),
-{}
+_heap_bot_card_ind(heap_bot_card_ind)
+{}
-void init(RSHashTable* rsht) {
-_rsht = rsht;
+void init(RSHashTable* rsht) {
-_tbl_ind = -1; // So that first increment gets to 0.
+_rsht = rsht;
-_bl_ind = RSHashTable::NullEntry;
+_tbl_ind = -1; // So that first increment gets to 0.
-_card_ind = (SparsePRTEntry::CardsPerEntry-1);
+_bl_ind = RSHashTable::NullEntry;
-}
+_card_ind = (SparsePRTEntry::CardsPerEntry-1);
+}
-bool has_next(size_t& card_index);
+bool has_next(size_t& card_index);
 };
 // Concurrent accesss to a SparsePRT must be serialized by some external
 // mutex.
 class SparsePRTIter;
 SparsePRT* _next_expanded;
 SparsePRT* next_expanded() { return _next_expanded; }
 void set_next_expanded(SparsePRT* nxt) { _next_expanded = nxt; }
 static SparsePRT* _head_expanded_list;
 public:
 SparsePRT(HeapRegion* hr);
 // the sparse table.  If successful (because the card was already
 // present, or because it was successfullly added) returns "true".
 // Otherwise, returns "false" to indicate that the addition would
 // overflow the entry for the region.  The caller must transfer these
 // entries to a larger-capacity representation.
-bool add_card(short region_id, short card_index);
+bool add_card(RegionIdx_t region_id, CardIdx_t card_index);
 // If the table hold an entry for "region_ind",  Copies its
 // cards into "cards", which must be an array of length at least
 // "CardsPerEntry", and returns "true"; otherwise, returns "false".
-bool get_cards(short region_ind, short* cards);
+bool get_cards(RegionIdx_t region_ind, CardIdx_t* cards);
 // If there is an entry for "region_ind", removes it and return "true";
 // otherwise returns "false."
-bool delete_entry(short region_ind);
+bool delete_entry(RegionIdx_t region_ind);
 // Clear the table, and reinitialize to initial capacity.
 void clear();
 // Ensure that "_cur" and "_next" point to the same table.
 // Clean up all tables on the expanded list.  Called single threaded.
 static void cleanup_all();
 RSHashTable* cur() const { return _cur; }
 void init_iterator(SparsePRTIter* sprt_iter);
 static void add_to_expanded_list(SparsePRT* sprt);
 static SparsePRT* get_from_expanded_list();
-bool contains_card(short region_id, short card_index) const {
+bool contains_card(RegionIdx_t region_id, CardIdx_t card_index) const {
 return _next->contains_card(region_id, card_index);
 }
 #if 0
 void verify_is_cleared();

comparison: src/share/vm/gc_implementation/g1/sparsePRT.hpp

src/share/vm/gc_implementation/g1/sparsePRT.hpp

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/gc_implementation/g1/sparsePRT.hpp

src/share/vm/gc_implementation/g1/sparsePRT.hpp