Commit 9ff9592c authored by haraken's avatar haraken Committed by Commit bot

Use v8::kGCCallbackFlagCollectAllAvailableGarbage in Heap::CollectAllAvailableGarbage

Now that the embedder side supports v8::kGCCallbackFlagCollectAllAvailableGarbage,
this CL removes the old v8::kGCCallbackFlagForced from Heap::CollectAllAvailableGarbage.

BUG=591463
LOG=Y

Review URL: https://codereview.chromium.org/1769893002

Cr-Commit-Position: refs/heads/master@{#34539}
parent c6dbb071
...@@ -984,7 +984,7 @@ int GlobalHandles::PostGarbageCollectionProcessing( ...@@ -984,7 +984,7 @@ int GlobalHandles::PostGarbageCollectionProcessing(
int freed_nodes = 0; int freed_nodes = 0;
bool synchronous_second_pass = bool synchronous_second_pass =
(gc_callback_flags & (gc_callback_flags &
(kGCCallbackFlagForced | (kGCCallbackFlagForced | kGCCallbackFlagCollectAllAvailableGarbage |
kGCCallbackFlagSynchronousPhantomCallbackProcessing)) != 0; kGCCallbackFlagSynchronousPhantomCallbackProcessing)) != 0;
freed_nodes += DispatchPendingPhantomCallbacks(synchronous_second_pass); freed_nodes += DispatchPendingPhantomCallbacks(synchronous_second_pass);
if (initial_post_gc_processing_count != post_gc_processing_count_) { if (initial_post_gc_processing_count != post_gc_processing_count_) {
......
...@@ -895,7 +895,7 @@ void Heap::CollectAllAvailableGarbage(const char* gc_reason) { ...@@ -895,7 +895,7 @@ void Heap::CollectAllAvailableGarbage(const char* gc_reason) {
const int kMinNumberOfAttempts = 2; const int kMinNumberOfAttempts = 2;
for (int attempt = 0; attempt < kMaxNumberOfAttempts; attempt++) { for (int attempt = 0; attempt < kMaxNumberOfAttempts; attempt++) {
if (!CollectGarbage(MARK_COMPACTOR, gc_reason, NULL, if (!CollectGarbage(MARK_COMPACTOR, gc_reason, NULL,
v8::kGCCallbackFlagForced) && v8::kGCCallbackFlagCollectAllAvailableGarbage) &&
attempt + 1 >= kMinNumberOfAttempts) { attempt + 1 >= kMinNumberOfAttempts) {
break; break;
} }
...@@ -1044,7 +1044,8 @@ bool Heap::CollectGarbage(GarbageCollector collector, const char* gc_reason, ...@@ -1044,7 +1044,8 @@ bool Heap::CollectGarbage(GarbageCollector collector, const char* gc_reason,
} }
if (collector == MARK_COMPACTOR && if (collector == MARK_COMPACTOR &&
(gc_callback_flags & kGCCallbackFlagForced) != 0) { (gc_callback_flags & (kGCCallbackFlagForced |
kGCCallbackFlagCollectAllAvailableGarbage)) != 0) {
isolate()->CountUsage(v8::Isolate::kForcedGC); isolate()->CountUsage(v8::Isolate::kForcedGC);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment