equal
deleted
inserted
replaced
113 #include "utilities/macros.hpp" |
113 #include "utilities/macros.hpp" |
114 #include "utilities/preserveException.hpp" |
114 #include "utilities/preserveException.hpp" |
115 #include "utilities/vmError.hpp" |
115 #include "utilities/vmError.hpp" |
116 #if INCLUDE_ALL_GCS |
116 #if INCLUDE_ALL_GCS |
117 #include "gc/cms/concurrentMarkSweepThread.hpp" |
117 #include "gc/cms/concurrentMarkSweepThread.hpp" |
|
118 #include "gc/g1/g1BarrierSet.hpp" |
118 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp" |
119 #include "gc/g1/g1ConcurrentMarkThread.inline.hpp" |
119 #include "gc/parallel/pcTasks.hpp" |
120 #include "gc/parallel/pcTasks.hpp" |
120 #endif // INCLUDE_ALL_GCS |
121 #endif // INCLUDE_ALL_GCS |
121 #if INCLUDE_JVMCI |
122 #if INCLUDE_JVMCI |
122 #include "jvmci/jvmciCompiler.hpp" |
123 #include "jvmci/jvmciCompiler.hpp" |
1587 } |
1588 } |
1588 |
1589 |
1589 pd_initialize(); |
1590 pd_initialize(); |
1590 } |
1591 } |
1591 |
1592 |
1592 #if INCLUDE_ALL_GCS |
|
1593 SATBMarkQueueSet JavaThread::_satb_mark_queue_set; |
|
1594 DirtyCardQueueSet JavaThread::_dirty_card_queue_set; |
|
1595 #endif // INCLUDE_ALL_GCS |
|
1596 |
|
1597 JavaThread::JavaThread(bool is_attaching_via_jni) : |
1593 JavaThread::JavaThread(bool is_attaching_via_jni) : |
1598 Thread() |
1594 Thread() |
1599 #if INCLUDE_ALL_GCS |
1595 #if INCLUDE_ALL_GCS |
1600 , _satb_mark_queue(&_satb_mark_queue_set), |
1596 , _satb_mark_queue(&G1BarrierSet::satb_mark_queue_set()), |
1601 _dirty_card_queue(&_dirty_card_queue_set) |
1597 _dirty_card_queue(&G1BarrierSet::dirty_card_queue_set()) |
1602 #endif // INCLUDE_ALL_GCS |
1598 #endif // INCLUDE_ALL_GCS |
1603 { |
1599 { |
1604 initialize(); |
1600 initialize(); |
1605 if (is_attaching_via_jni) { |
1601 if (is_attaching_via_jni) { |
1606 _jni_attach_state = _attaching_via_jni; |
1602 _jni_attach_state = _attaching_via_jni; |
1662 static void sweeper_thread_entry(JavaThread* thread, TRAPS); |
1658 static void sweeper_thread_entry(JavaThread* thread, TRAPS); |
1663 |
1659 |
1664 JavaThread::JavaThread(ThreadFunction entry_point, size_t stack_sz) : |
1660 JavaThread::JavaThread(ThreadFunction entry_point, size_t stack_sz) : |
1665 Thread() |
1661 Thread() |
1666 #if INCLUDE_ALL_GCS |
1662 #if INCLUDE_ALL_GCS |
1667 , _satb_mark_queue(&_satb_mark_queue_set), |
1663 , _satb_mark_queue(&G1BarrierSet::satb_mark_queue_set()), |
1668 _dirty_card_queue(&_dirty_card_queue_set) |
1664 _dirty_card_queue(&G1BarrierSet::dirty_card_queue_set()) |
1669 #endif // INCLUDE_ALL_GCS |
1665 #endif // INCLUDE_ALL_GCS |
1670 { |
1666 { |
1671 initialize(); |
1667 initialize(); |
1672 _jni_attach_state = _not_attaching_via_jni; |
1668 _jni_attach_state = _not_attaching_via_jni; |
1673 set_entry_point(entry_point); |
1669 set_entry_point(entry_point); |