8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS

Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS.

Reviewed-by: coleenp, stefank
This commit is contained in:
Joseph Provino 2013-01-23 13:02:39 -05:00
parent 1c9730cfb8
commit 698fba94ef
119 changed files with 560 additions and 447 deletions

View file

@ -30,9 +30,10 @@
#include "memory/heap.hpp"
#include "memory/space.hpp"
#include "services/memoryUsage.hpp"
#ifndef SERIALGC
#include "utilities/macros.hpp"
#if INCLUDE_ALL_GCS
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
#endif
#endif // INCLUDE_ALL_GCS
// A memory pool represents the memory area that the VM manages.
// The Java virtual machine has at least one memory pool
@ -185,7 +186,7 @@ public:
}
};
#ifndef SERIALGC
#if INCLUDE_ALL_GCS
class CompactibleFreeListSpacePool : public CollectedMemoryPool {
private:
CompactibleFreeListSpace* _space;
@ -199,7 +200,7 @@ public:
MemoryUsage get_memory_usage();
size_t used_in_bytes() { return _space->used(); }
};
#endif // SERIALGC
#endif // INCLUDE_ALL_GCS
class GenerationPool : public CollectedMemoryPool {