src/hotspot/share/gc/g1/dirtyCardQueue.cpp

rev 52689 : [mq]: tschatzl_review

*** 29,38 ****
--- 29,39 ----
  #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegionRemSet.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/workgroup.hpp"
  #include "runtime/atomic.hpp"
+ #include "runtime/flags/flagSetting.hpp"
  #include "runtime/mutexLocker.hpp"
  #include "runtime/safepoint.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/threadSMR.hpp"
  
*** 328,341 ****
  void DirtyCardQueueSet::concatenate_logs() {
    // Iterate over all the threads, if we find a partial log add it to
    // the global list of logs.  Temporarily turn off the limit on the number
    // of outstanding buffers.
    assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint.");
!   size_t save_max_completed_buffers = _max_completed_buffers;
!   _max_completed_buffers = _max_completed_buffers_unlimited;
    for (JavaThreadIteratorWithHandle jtiwh; JavaThread *t = jtiwh.next(); ) {
      concatenate_log(G1ThreadLocalData::dirty_card_queue(t));
    }
    concatenate_log(_shared_dirty_card_queue);
-   // Restore the completed buffer limit.
-   _max_completed_buffers = save_max_completed_buffers;
  }
--- 329,340 ----
  void DirtyCardQueueSet::concatenate_logs() {
    // Iterate over all the threads, if we find a partial log add it to
    // the global list of logs.  Temporarily turn off the limit on the number
    // of outstanding buffers.
    assert(SafepointSynchronize::is_at_safepoint(), "Must be at safepoint.");
!   SizeTFlagSetting local_max(_max_completed_buffers,
!                              MaxCompletedBuffersUnlimited);
    for (JavaThreadIteratorWithHandle jtiwh; JavaThread *t = jtiwh.next(); ) {
      concatenate_log(G1ThreadLocalData::dirty_card_queue(t));
    }
    concatenate_log(_shared_dirty_card_queue);
  }