graal-compiler: src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp comparison

comparison src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Wed, 15 Oct 2014 16:02:50 +0200
parents	89152779163c ae7336d6337e
children	7848fc12602b

comparison

equal deleted inserted replaced

-:45d7b2c7029d
+:52b4284cb496
 /*
-* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 */
 #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP
 #define SHARE_VM_GC_IMPLEMENTATION_G1_HEAPREGIONREMSET_HPP
+#include "gc_implementation/g1/g1CodeCacheRemSet.hpp"
 #include "gc_implementation/g1/sparsePRT.hpp"
 // Remembered set for a heap region.  Represent a set of "cards" that
 // contain pointers into the owner heap region.  Cards are defined somewhat
 // abstractly, in terms of what the "BlockOffsetTable" in use can parse.
 class nmethod;
 // Essentially a wrapper around SparsePRTCleanupTask. See
 // sparsePRT.hpp for more details.
 class HRRSCleanupTask : public SparsePRTCleanupTask {
+};
+// The FromCardCache remembers the most recently processed card on the heap on
+// a per-region and per-thread basis.
+class FromCardCache : public AllStatic {
+private:
+// Array of card indices. Indexed by thread X and heap region to minimize
+// thread contention.
+static int** _cache;
+static uint _max_regions;
+static size_t _static_mem_size;
+public:
+enum {
+InvalidCard = -1 // Card value of an invalid card, i.e. a card index not otherwise used.
+};
+static void clear(uint region_idx);
+// Returns true if the given card is in the cache at the given location, or
+// replaces the card at that location and returns false.
+static bool contains_or_replace(uint worker_id, uint region_idx, int card) {
+int card_in_cache = at(worker_id, region_idx);
+if (card_in_cache == card) {
+return true;
+} else {
+set(worker_id, region_idx, card);
+return false;
+}
+}
+static int at(uint worker_id, uint region_idx) {
+return _cache[worker_id][region_idx];
+}
+static void set(uint worker_id, uint region_idx, int val) {
+_cache[worker_id][region_idx] = val;
+}
+static void initialize(uint n_par_rs, uint max_num_regions);
+static void shrink(uint new_num_regions);
+static void print(outputStream* out = gclog_or_tty) PRODUCT_RETURN;
+static size_t static_mem_size() {
+return _static_mem_size;
+}
 };
 // The "_coarse_map" is a bitmap with one bit for each region, where set
 // bits indicate that the corresponding region may contain some pointer
 // into the owning region.
 class OtherRegionsTable VALUE_OBJ_CLASS_SPEC {
 friend class HeapRegionRemSetIterator;
 G1CollectedHeap* _g1h;
-Mutex            _m;
+Mutex*           _m;
 HeapRegion*      _hr;
 // These are protected by "_m".
 BitMap      _coarse_map;
 size_t      _n_coarse_entries;
 // If a PRT for "hr" is in the bucket list indicated by "ind" (which must
 // be the correct index for "hr"), delete it and return true; else return
 // false.
 bool del_single_region_table(size_t ind, HeapRegion* hr);
-// Indexed by thread X heap region, to minimize thread contention.
-static int** _from_card_cache;
-static size_t _from_card_cache_max_regions;
-static size_t _from_card_cache_mem_size;
 // link/add the given fine grain remembered set into the "all" list
 void link_to_all(PerRegionTable * prt);
 // unlink/remove the given fine grain remembered set into the "all" list
 void unlink_from_all(PerRegionTable * prt);
 public:
-OtherRegionsTable(HeapRegion* hr);
+OtherRegionsTable(HeapRegion* hr, Mutex* m);
 HeapRegion* hr() const { return _hr; }
 // For now.  Could "expand" some tables in the future, so that this made
 // sense.
 // Removes any entries shown by the given bitmaps to contain only dead
 // objects.
 void scrub(CardTableModRefBS* ctbs, BitMap* region_bm, BitMap* card_bm);
-// Not const because it takes a lock.
 size_t occupied() const;
 size_t occ_fine() const;
 size_t occ_coarse() const;
 size_t occ_sparse() const;
 void do_cleanup_work(HRRSCleanupTask* hrrs_cleanup_task);
 // Declare the heap size (in # of regions) to the OtherRegionsTable.
 // (Uses it to initialize from_card_cache).
-static void init_from_card_cache(size_t max_regions);
+static void init_from_card_cache(uint max_regions);
 // Declares that only regions i s.t. 0 <= i < new_n_regs are in use.
 // Make sure any entries for higher regions are invalid.
-static void shrink_from_card_cache(size_t new_n_regs);
+static void shrink_from_card_cache(uint new_num_regions);
 static void print_from_card_cache();
 };
 class HeapRegionRemSet : public CHeapObj<mtGC> {
 private:
 G1BlockOffsetSharedArray* _bosa;
 G1BlockOffsetSharedArray* bosa() const { return _bosa; }
-// A list of code blobs (nmethods) whose code contains pointers into
+// A set of code blobs (nmethods) whose code contains pointers into
 // the region that owns this RSet.
-GrowableArray<nmethod*>* _strong_code_roots_list;
+G1CodeRootSet _code_roots;
+Mutex _m;
 OtherRegionsTable _other_regions;
 enum ParIterState { Unclaimed, Claimed, Complete };
 volatile ParIterState _iter_state;
 static int          _n_recorded_events;
 static void print_event(outputStream* str, Event evnt);
 public:
-HeapRegionRemSet(G1BlockOffsetSharedArray* bosa,
+HeapRegionRemSet(G1BlockOffsetSharedArray* bosa, HeapRegion* hr);
-HeapRegion* hr);
+static uint num_par_rem_sets();
-static int num_par_rem_sets();
 static void setup_remset_size();
 HeapRegion* hr() const {
 return _other_regions.hr();
 }
-size_t occupied() const {
+size_t occupied() {
+MutexLockerEx x(&_m, Mutex::_no_safepoint_check_flag);
+return occupied_locked();
+}
+size_t occupied_locked() {
 return _other_regions.occupied();
 }
 size_t occ_fine() const {
 return _other_regions.occ_fine();
 }
 void scrub(CardTableModRefBS* ctbs, BitMap* region_bm, BitMap* card_bm);
 // The region is being reclaimed; clear its remset, and any mention of
 // entries for this region in other remsets.
 void clear();
+void clear_locked();
 // Attempt to claim the region.  Returns true iff this call caused an
 // atomic transition from Unclaimed to Claimed.
 bool claim_iter();
 // Sets the iteration state to "complete".
 }
 // The actual # of bytes this hr_remset takes up.
 // Note also includes the strong code root set.
 size_t mem_size() {
+MutexLockerEx x(&_m, Mutex::_no_safepoint_check_flag);
 return _other_regions.mem_size()
 // This correction is necessary because the above includes the second
 // part.
 + (sizeof(this) - sizeof(OtherRegionsTable))
 + strong_code_roots_mem_size();
 }
 // Returns the memory occupancy of all static data structures associated
 // with remembered sets.
 static size_t static_mem_size() {
-return OtherRegionsTable::static_mem_size();
+return OtherRegionsTable::static_mem_size() + G1CodeRootSet::static_mem_size();
 }
 // Returns the memory occupancy of all free_list data structures associated
 // with remembered sets.
 static size_t fl_mem_size() {
-return OtherRegionsTable::fl_mem_size();
+return OtherRegionsTable::fl_mem_size() + G1CodeRootSet::fl_mem_size();
 }
 bool contains_reference(OopOrNarrowOopStar from) const {
 return _other_regions.contains_reference(from);
 }
 // Applies blk->do_code_blob() to each of the entries in
 // the strong code roots list
 void strong_code_roots_do(CodeBlobClosure* blk) const;
 // Returns the number of elements in the strong code roots list
-int strong_code_roots_list_length() {
+size_t strong_code_roots_list_length() {
-return _strong_code_roots_list->length();
+return _code_roots.length();
 }
 // Returns true if the strong code roots contains the given
 // nmethod.
 bool strong_code_roots_list_contains(nmethod* nm) {
-return _strong_code_roots_list->contains(nm);
+return _code_roots.contains(nm);
 }
 // Returns the amount of memory, in bytes, currently
 // consumed by the strong code roots.
 size_t strong_code_roots_mem_size();
-void print() const;
+void print() PRODUCT_RETURN;
 // Called during a stop-world phase to perform any deferred cleanups.
 static void cleanup();
 // Declare the heap size (in # of regions) to the HeapRegionRemSet(s).
 // (Uses it to initialize from_card_cache).
 static void init_heap(uint max_regions) {
-OtherRegionsTable::init_from_card_cache((size_t) max_regions);
+G1CodeRootSet::initialize();
+OtherRegionsTable::init_from_card_cache(max_regions);
 }
 // Declares that only regions i s.t. 0 <= i < new_n_regs are in use.
 static void shrink_heap(uint new_n_regs) {
-OtherRegionsTable::shrink_from_card_cache((size_t) new_n_regs);
+OtherRegionsTable::shrink_from_card_cache(new_n_regs);
 }
 #ifndef PRODUCT
 static void print_from_card_cache() {
 OtherRegionsTable::print_from_card_cache();
 };
 class HeapRegionRemSetIterator : public StackObj {
 // The region RSet over which we're iterating.
-const HeapRegionRemSet* _hrrs;
+HeapRegionRemSet* _hrrs;
 // Local caching of HRRS fields.
 const BitMap*             _coarse_map;
 PerRegionTable**          _fine_grain_regions;
 bool fine_has_next(size_t& card_index);
 public:
 // We require an iterator to be initialized before use, so the
 // constructor does little.
-HeapRegionRemSetIterator(const HeapRegionRemSet* hrrs);
+HeapRegionRemSetIterator(HeapRegionRemSet* hrrs);
 // If there remains one or more cards to be yielded, returns true and
 // sets "card_index" to one of those cards (which is then considered
 // yielded.)   Otherwise, returns false (and leaves "card_index"
 // undefined.)

Mercurial > hg > graal-compiler

comparison src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp @ 18041:52b4284cb496