Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: Source/platform/heap/ThreadState.cpp

Issue 1003113002: Allow GCScheduledForTesting ThreadState transition while sweeping-idle. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 { 631 {
632 switch (gcState) { 632 switch (gcState) {
633 case NoGCScheduled: 633 case NoGCScheduled:
634 checkThread(); 634 checkThread();
635 RELEASE_ASSERT(m_gcState == StoppingOtherThreads || m_gcState == Sweepin g || m_gcState == SweepingAndIdleGCScheduled); 635 RELEASE_ASSERT(m_gcState == StoppingOtherThreads || m_gcState == Sweepin g || m_gcState == SweepingAndIdleGCScheduled);
636 break; 636 break;
637 case IdleGCScheduled: 637 case IdleGCScheduled:
638 case PreciseGCScheduled: 638 case PreciseGCScheduled:
639 case GCScheduledForTesting: 639 case GCScheduledForTesting:
640 checkThread(); 640 checkThread();
641 RELEASE_ASSERT(m_gcState == NoGCScheduled || m_gcState == IdleGCSchedule d || m_gcState == PreciseGCScheduled || m_gcState == GCScheduledForTesting || m_ gcState == StoppingOtherThreads || m_gcState == SweepingAndPreciseGCScheduled); 641 RELEASE_ASSERT(m_gcState == NoGCScheduled || m_gcState == IdleGCSchedule d || m_gcState == PreciseGCScheduled || m_gcState == GCScheduledForTesting || m_ gcState == StoppingOtherThreads || m_gcState == SweepingAndIdleGCScheduled || m_ gcState == SweepingAndPreciseGCScheduled);
642 completeSweep(); 642 completeSweep();
643 break; 643 break;
644 case StoppingOtherThreads: 644 case StoppingOtherThreads:
645 checkThread(); 645 checkThread();
646 RELEASE_ASSERT(m_gcState == NoGCScheduled || m_gcState == IdleGCSchedule d || m_gcState == PreciseGCScheduled || m_gcState == GCScheduledForTesting || m_ gcState == Sweeping || m_gcState == SweepingAndIdleGCScheduled || m_gcState == S weepingAndPreciseGCScheduled); 646 RELEASE_ASSERT(m_gcState == NoGCScheduled || m_gcState == IdleGCSchedule d || m_gcState == PreciseGCScheduled || m_gcState == GCScheduledForTesting || m_ gcState == Sweeping || m_gcState == SweepingAndIdleGCScheduled || m_gcState == S weepingAndPreciseGCScheduled);
647 completeSweep(); 647 completeSweep();
648 break; 648 break;
649 case GCRunning: 649 case GCRunning:
650 ASSERT(!isInGC()); 650 ASSERT(!isInGC());
651 RELEASE_ASSERT(m_gcState != GCRunning); 651 RELEASE_ASSERT(m_gcState != GCRunning);
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 json->beginArray(it->key.ascii().data()); 1199 json->beginArray(it->key.ascii().data());
1200 for (size_t age = 0; age <= maxHeapObjectAge; ++age) 1200 for (size_t age = 0; age <= maxHeapObjectAge; ++age)
1201 json->pushInteger(it->value.ages[age]); 1201 json->pushInteger(it->value.ages[age]);
1202 json->endArray(); 1202 json->endArray();
1203 } 1203 }
1204 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release()); 1204 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release());
1205 } 1205 }
1206 #endif 1206 #endif
1207 1207
1208 } // namespace blink 1208 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698