1.1 --- a/src/share/vm/runtime/safepoint.cpp Fri Jan 18 05:33:32 2013 -0800
1.2 +++ b/src/share/vm/runtime/safepoint.cpp Wed Jan 23 13:02:39 2013 -0500
1.3 @@ -52,6 +52,7 @@
1.4 #include "services/memTracker.hpp"
1.5 #include "services/runtimeService.hpp"
1.6 #include "utilities/events.hpp"
1.7 +#include "utilities/macros.hpp"
1.8 #ifdef TARGET_ARCH_x86
1.9 # include "nativeInst_x86.hpp"
1.10 # include "vmreg_x86.inline.hpp"
1.11 @@ -72,10 +73,10 @@
1.12 # include "nativeInst_ppc.hpp"
1.13 # include "vmreg_ppc.inline.hpp"
1.14 #endif
1.15 -#ifndef SERIALGC
1.16 +#if INCLUDE_ALL_GCS
1.17 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
1.18 #include "gc_implementation/shared/concurrentGCThread.hpp"
1.19 -#endif
1.20 +#endif // INCLUDE_ALL_GCS
1.21 #ifdef COMPILER1
1.22 #include "c1/c1_globals.hpp"
1.23 #endif
1.24 @@ -103,7 +104,7 @@
1.25 _ts_of_current_safepoint = tty->time_stamp().seconds();
1.26 }
1.27
1.28 -#ifndef SERIALGC
1.29 +#if INCLUDE_ALL_GCS
1.30 if (UseConcMarkSweepGC) {
1.31 // In the future we should investigate whether CMS can use the
1.32 // more-general mechanism below. DLD (01/05).
1.33 @@ -111,7 +112,7 @@
1.34 } else if (UseG1GC) {
1.35 ConcurrentGCThread::safepoint_synchronize();
1.36 }
1.37 -#endif // SERIALGC
1.38 +#endif // INCLUDE_ALL_GCS
1.39
1.40 // By getting the Threads_lock, we assure that no threads are about to start or
1.41 // exit. It is released again in SafepointSynchronize::end().
1.42 @@ -480,14 +481,14 @@
1.43 Threads_lock->unlock();
1.44
1.45 }
1.46 -#ifndef SERIALGC
1.47 +#if INCLUDE_ALL_GCS
1.48 // If there are any concurrent GC threads resume them.
1.49 if (UseConcMarkSweepGC) {
1.50 ConcurrentMarkSweepThread::desynchronize(false);
1.51 } else if (UseG1GC) {
1.52 ConcurrentGCThread::safepoint_desynchronize();
1.53 }
1.54 -#endif // SERIALGC
1.55 +#endif // INCLUDE_ALL_GCS
1.56 // record this time so VMThread can keep track how much time has elasped
1.57 // since last safepoint.
1.58 _end_of_last_safepoint = os::javaTimeMillis();
