Need a sponsor for push 8141123 into jd9/hs-rt
Alexander Harlap
alexander.harlap at oracle.com
Thu Nov 19 21:26:26 UTC 2015
I need a sponsor to push attached 8141123 - Cleanup in FreeIdSet
Alex
-------------- next part --------------
# HG changeset patch
# User aharlap
# Date 1447955938 18000
# Node ID a2042411e2b58793400a8170bb59ea679908071a
# Parent 44df756148b3d6ee6884c924868bae46cf041abe
8141123: Cleanup in FreeIdSet
Summary: Some members of FreeIdSet should be size_t instead of ints. Also remove unused code
Reviewed-by: tschatzl
diff -r 44df756148b3 -r a2042411e2b5 src/share/vm/gc/g1/dirtyCardQueue.cpp
--- a/src/share/vm/gc/g1/dirtyCardQueue.cpp Wed Nov 18 22:00:09 2015 +0000
+++ b/src/share/vm/gc/g1/dirtyCardQueue.cpp Thu Nov 19 12:58:58 2015 -0500
@@ -112,7 +112,7 @@
fl_owner);
set_buffer_size(G1UpdateBufferSize);
_shared_dirty_card_queue.set_lock(lock);
- _free_ids = new FreeIdSet((int) num_par_ids(), _cbl_mon);
+ _free_ids = new FreeIdSet(num_par_ids(), _cbl_mon);
}
void DirtyCardQueueSet::handle_zero_index_for_thread(JavaThread* t) {
diff -r 44df756148b3 -r a2042411e2b5 src/share/vm/gc/shared/workgroup.cpp
--- a/src/share/vm/gc/shared/workgroup.cpp Wed Nov 18 22:00:09 2015 +0000
+++ b/src/share/vm/gc/shared/workgroup.cpp Thu Nov 19 12:58:58 2015 -0500
@@ -501,122 +501,47 @@
return false;
}
-bool FreeIdSet::_stat_init = false;
-FreeIdSet* FreeIdSet::_sets[NSets];
-bool FreeIdSet::_safepoint;
-
-FreeIdSet::FreeIdSet(int sz, Monitor* mon) :
- _sz(sz), _mon(mon), _hd(0), _waiters(0), _index(-1), _claimed(0)
+FreeIdSet::FreeIdSet(uint size, Monitor* mon) :
+ _size(size), _mon(mon), _hd(0), _waiters(0), _claimed(0)
{
- _ids = NEW_C_HEAP_ARRAY(int, sz, mtInternal);
- for (int i = 0; i < sz; i++) _ids[i] = i+1;
- _ids[sz-1] = end_of_list; // end of list.
- if (_stat_init) {
- for (int j = 0; j < NSets; j++) _sets[j] = NULL;
- _stat_init = true;
+ guarantee(size != 0, "must be");
+ _ids = NEW_C_HEAP_ARRAY(uint, size, mtGC);
+ for (uint i = 0; i < size - 1; i++) {
+ _ids[i] = i+1;
}
- // Add to sets. (This should happen while the system is still single-threaded.)
- for (int j = 0; j < NSets; j++) {
- if (_sets[j] == NULL) {
- _sets[j] = this;
- _index = j;
- break;
- }
- }
- guarantee(_index != -1, "Too many FreeIdSets in use!");
+ _ids[size-1] = end_of_list; // end of list.
}
FreeIdSet::~FreeIdSet() {
- _sets[_index] = NULL;
- FREE_C_HEAP_ARRAY(int, _ids);
+ FREE_C_HEAP_ARRAY(uint, _ids);
}
-void FreeIdSet::set_safepoint(bool b) {
- _safepoint = b;
- if (b) {
- for (int j = 0; j < NSets; j++) {
- if (_sets[j] != NULL && _sets[j]->_waiters > 0) {
- Monitor* mon = _sets[j]->_mon;
- mon->lock_without_safepoint_check();
- mon->notify_all();
- mon->unlock();
- }
- }
- }
-}
-
-#define FID_STATS 0
-
-int FreeIdSet::claim_par_id() {
-#if FID_STATS
- thread_t tslf = thr_self();
- tty->print("claim_par_id[%d]: sz = %d, claimed = %d\n", tslf, _sz, _claimed);
-#endif
+uint FreeIdSet::claim_par_id() {
MutexLockerEx x(_mon, Mutex::_no_safepoint_check_flag);
- while (!_safepoint && _hd == end_of_list) {
+ while (_hd == end_of_list) {
_waiters++;
-#if FID_STATS
- if (_waiters > 5) {
- tty->print("claim_par_id waiting[%d]: %d waiters, %d claimed.\n",
- tslf, _waiters, _claimed);
- }
-#endif
_mon->wait(Mutex::_no_safepoint_check_flag);
_waiters--;
}
if (_hd == end_of_list) {
-#if FID_STATS
- tty->print("claim_par_id[%d]: returning EOL.\n", tslf);
-#endif
- return -1;
+ return UINT_MAX;
} else {
int res = _hd;
_hd = _ids[res];
_ids[res] = claimed; // For debugging.
_claimed++;
-#if FID_STATS
- tty->print("claim_par_id[%d]: returning %d, claimed = %d.\n",
- tslf, res, _claimed);
-#endif
return res;
}
}
-bool FreeIdSet::claim_perm_id(int i) {
- assert(0 <= i && i < _sz, "Out of range.");
- MutexLockerEx x(_mon, Mutex::_no_safepoint_check_flag);
- int prev = end_of_list;
- int cur = _hd;
- while (cur != end_of_list) {
- if (cur == i) {
- if (prev == end_of_list) {
- _hd = _ids[cur];
- } else {
- _ids[prev] = _ids[cur];
- }
- _ids[cur] = claimed;
- _claimed++;
- return true;
- } else {
- prev = cur;
- cur = _ids[cur];
- }
- }
- return false;
-
-}
-
-void FreeIdSet::release_par_id(int id) {
+void FreeIdSet::release_par_id(uint id) {
MutexLockerEx x(_mon, Mutex::_no_safepoint_check_flag);
assert(_ids[id] == claimed, "Precondition.");
_ids[id] = _hd;
_hd = id;
_claimed--;
-#if FID_STATS
- tty->print("[%d] release_par_id(%d), waiters =%d, claimed = %d.\n",
- thr_self(), id, _waiters, _claimed);
-#endif
- if (_waiters > 0)
+ if (_waiters > 0) {
// Notify all would be safer, but this is OK, right?
_mon->notify_all();
+ }
}
diff -r 44df756148b3 -r a2042411e2b5 src/share/vm/gc/shared/workgroup.hpp
--- a/src/share/vm/gc/shared/workgroup.hpp Wed Nov 18 22:00:09 2015 +0000
+++ b/src/share/vm/gc/shared/workgroup.hpp Thu Nov 19 12:58:58 2015 -0500
@@ -379,42 +379,29 @@
};
// Represents a set of free small integer ids.
-class FreeIdSet : public CHeapObj<mtInternal> {
+class FreeIdSet : public CHeapObj<mtGC> {
enum {
- end_of_list = -1,
- claimed = -2
+ end_of_list = UINT_MAX,
+ claimed = UINT_MAX - 1
};
- int _sz;
+ uint _size;
Monitor* _mon;
- int* _ids;
- int _hd;
- int _waiters;
- int _claimed;
-
- static bool _safepoint;
- typedef FreeIdSet* FreeIdSetPtr;
- static const int NSets = 10;
- static FreeIdSetPtr _sets[NSets];
- static bool _stat_init;
- int _index;
+ uint* _ids;
+ uint _hd;
+ uint _waiters;
+ uint _claimed;
public:
- FreeIdSet(int sz, Monitor* mon);
+ FreeIdSet(uint size, Monitor* mon);
~FreeIdSet();
- static void set_safepoint(bool b);
+ // Returns an unclaimed parallel id (waiting for one to be released if
+ // necessary). Returns "UINT_MAX" if a GC wakes up a wait for an id.
+ uint claim_par_id();
- // Attempt to claim the given id permanently. Returns "true" iff
- // successful.
- bool claim_perm_id(int i);
-
- // Returns an unclaimed parallel id (waiting for one to be released if
- // necessary). Returns "-1" if a GC wakes up a wait for an id.
- int claim_par_id();
-
- void release_par_id(int id);
+ void release_par_id(uint id);
};
#endif // SHARE_VM_GC_SHARED_WORKGROUP_HPP
More information about the hotspot-gc-dev
mailing list