diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2015-01-09 14:03:35 -0800 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2015-01-23 14:07:32 -0800 |
| commit | 2cd334ae2d4287216523882f0d298cf3901b7ab1 (patch) | |
| tree | b72d3d07e5a04151caca96cae345075b6e4452b0 /runtime/entrypoints/quick | |
| parent | 604e2828896fbb8663897d1e75112da7305ead4c (diff) | |
| download | art-2cd334ae2d4287216523882f0d298cf3901b7ab1.zip art-2cd334ae2d4287216523882f0d298cf3901b7ab1.tar.gz art-2cd334ae2d4287216523882f0d298cf3901b7ab1.tar.bz2 | |
More of the concurrent copying collector.
Bug: 12687968
Change-Id: I62f70274d47df6d6cab714df95c518b750ce3105
Diffstat (limited to 'runtime/entrypoints/quick')
| -rw-r--r-- | runtime/entrypoints/quick/quick_alloc_entrypoints.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc index 1fd1150..c049e3d 100644 --- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc @@ -163,6 +163,8 @@ GENERATE_ENTRYPOINTS_FOR_ALLOCATOR(DlMalloc, gc::kAllocatorTypeDlMalloc) GENERATE_ENTRYPOINTS_FOR_ALLOCATOR(RosAlloc, gc::kAllocatorTypeRosAlloc) GENERATE_ENTRYPOINTS_FOR_ALLOCATOR(BumpPointer, gc::kAllocatorTypeBumpPointer) GENERATE_ENTRYPOINTS_FOR_ALLOCATOR(TLAB, gc::kAllocatorTypeTLAB) +GENERATE_ENTRYPOINTS_FOR_ALLOCATOR(Region, gc::kAllocatorTypeRegion) +GENERATE_ENTRYPOINTS_FOR_ALLOCATOR(RegionTLAB, gc::kAllocatorTypeRegionTLAB) #define GENERATE_ENTRYPOINTS(suffix) \ extern "C" void* art_quick_alloc_array##suffix(uint32_t, int32_t, mirror::ArtMethod* ref); \ @@ -213,6 +215,8 @@ GENERATE_ENTRYPOINTS(_dlmalloc) GENERATE_ENTRYPOINTS(_rosalloc) GENERATE_ENTRYPOINTS(_bump_pointer) GENERATE_ENTRYPOINTS(_tlab) +GENERATE_ENTRYPOINTS(_region) +GENERATE_ENTRYPOINTS(_region_tlab) #endif static bool entry_points_instrumented = false; @@ -247,6 +251,16 @@ void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints) { SetQuickAllocEntryPoints_tlab(qpoints, entry_points_instrumented); return; } + case gc::kAllocatorTypeRegion: { + CHECK(kMovingCollector); + SetQuickAllocEntryPoints_region(qpoints, entry_points_instrumented); + return; + } + case gc::kAllocatorTypeRegionTLAB: { + CHECK(kMovingCollector); + SetQuickAllocEntryPoints_region_tlab(qpoints, entry_points_instrumented); + return; + } default: break; } |