src/share/vm/runtime/thread.cpp

rev 8362 : [mq]: hotspot

*** 28,42 ****
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/scopeDesc.hpp"
  #include "compiler/compileBroker.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/linkResolver.hpp"
  #include "interpreter/oopMapCache.hpp"
  #include "jvmtifiles/jvmtiEnv.hpp"
- #include "memory/gcLocker.inline.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/objArrayOop.hpp"
--- 28,43 ----
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "code/codeCache.hpp"
  #include "code/scopeDesc.hpp"
  #include "compiler/compileBroker.hpp"
+ #include "gc/shared/gcLocker.inline.hpp"
+ #include "gc/shared/workgroup.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/linkResolver.hpp"
  #include "interpreter/oopMapCache.hpp"
  #include "jvmtifiles/jvmtiEnv.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/objArrayOop.hpp"
*** 80,101 ****
  #include "runtime/vm_version.hpp"
  #include "services/attachListener.hpp"
  #include "services/management.hpp"
  #include "services/memTracker.hpp"
  #include "services/threadService.hpp"
- #include "trace/tracing.hpp"
  #include "trace/traceMacros.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/preserveException.hpp"
- #include "utilities/workgroup.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
! #include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
! #include "gc_implementation/parallelScavenge/pcTasks.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_Compiler.hpp"
  #endif
  #ifdef COMPILER2
--- 81,101 ----
  #include "runtime/vm_version.hpp"
  #include "services/attachListener.hpp"
  #include "services/management.hpp"
  #include "services/memTracker.hpp"
  #include "services/threadService.hpp"
  #include "trace/traceMacros.hpp"
+ #include "trace/tracing.hpp"
  #include "utilities/defaultStream.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/macros.hpp"
  #include "utilities/preserveException.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/cms/concurrentMarkSweepThread.hpp"
! #include "gc/g1/concurrentMarkThread.inline.hpp"
! #include "gc/parallel/pcTasks.hpp"
  #endif // INCLUDE_ALL_GCS
  #ifdef COMPILER1
  #include "c1/c1_Compiler.hpp"
  #endif
  #ifdef COMPILER2