Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 719 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 730 break; | 730 break; |
| 731 case IdleGCScheduled: | 731 case IdleGCScheduled: |
| 732 case PreciseGCScheduled: | 732 case PreciseGCScheduled: |
| 733 case FullGCScheduled: | 733 case FullGCScheduled: |
| 734 checkThread(); | 734 checkThread(); |
| 735 VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleG CScheduled || m_gcState == PreciseGCScheduled || m_gcState == FullGCScheduled || m_gcState == StoppingOtherThreads || m_gcState == SweepingAndIdleGCScheduled || m_gcState == SweepingAndPreciseGCScheduled); | 735 VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleG CScheduled || m_gcState == PreciseGCScheduled || m_gcState == FullGCScheduled || m_gcState == StoppingOtherThreads || m_gcState == SweepingAndIdleGCScheduled || m_gcState == SweepingAndPreciseGCScheduled); |
| 736 completeSweep(); | 736 completeSweep(); |
| 737 break; | 737 break; |
| 738 case StoppingOtherThreads: | 738 case StoppingOtherThreads: |
| 739 checkThread(); | 739 checkThread(); |
| 740 VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleG CScheduled || m_gcState == PreciseGCScheduled || m_gcState == FullGCScheduled || m_gcState == Sweeping || m_gcState == SweepingAndIdleGCScheduled || m_gcState = = SweepingAndPreciseGCScheduled); | 740 VERIFY_STATE_TRANSITION(m_gcState == NoGCScheduled || m_gcState == IdleG CScheduled || m_gcState == PreciseGCScheduled || m_gcState == FullGCScheduled || m_gcState == Sweeping || m_gcState == SweepingAndIdleGCScheduled || m_gcState = = SweepingAndPreciseGCScheduled); |
|
haraken
2015/05/21 23:01:35
I think you can now remove a couple of states from
sof
2015/05/22 05:07:05
Maybe, not so sure -- sweeping might be forbidden
haraken
2015/05/22 05:13:05
Since you're calling completeSweep() before settin
| |
| 741 completeSweep(); | |
| 742 break; | 741 break; |
| 743 case GCRunning: | 742 case GCRunning: |
| 744 ASSERT(!isInGC()); | 743 ASSERT(!isInGC()); |
| 745 VERIFY_STATE_TRANSITION(m_gcState != GCRunning); | 744 VERIFY_STATE_TRANSITION(m_gcState != GCRunning); |
| 746 break; | 745 break; |
| 747 case EagerSweepScheduled: | 746 case EagerSweepScheduled: |
| 748 case LazySweepScheduled: | 747 case LazySweepScheduled: |
| 749 ASSERT(isInGC()); | 748 ASSERT(isInGC()); |
| 750 VERIFY_STATE_TRANSITION(m_gcState == GCRunning); | 749 VERIFY_STATE_TRANSITION(m_gcState == GCRunning); |
| 751 break; | 750 break; |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1329 json->beginArray(it->key.ascii().data()); | 1328 json->beginArray(it->key.ascii().data()); |
| 1330 for (size_t age = 0; age <= maxHeapObjectAge; ++age) | 1329 for (size_t age = 0; age <= maxHeapObjectAge; ++age) |
| 1331 json->pushInteger(it->value.ages[age]); | 1330 json->pushInteger(it->value.ages[age]); |
| 1332 json->endArray(); | 1331 json->endArray(); |
| 1333 } | 1332 } |
| 1334 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release()); | 1333 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release()); |
| 1335 } | 1334 } |
| 1336 #endif | 1335 #endif |
| 1337 | 1336 |
| 1338 } // namespace blink | 1337 } // namespace blink |
| OLD | NEW |