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 877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 888 TRACE_EVENT0("blink_gc", "ThreadState::invokePreFinalizers"); | 888 TRACE_EVENT0("blink_gc", "ThreadState::invokePreFinalizers"); |
| 889 invokePreFinalizers(*Heap::s_markingVisitor); | 889 invokePreFinalizers(*Heap::s_markingVisitor); |
| 890 } | 890 } |
| 891 } | 891 } |
| 892 | 892 |
| 893 if (isMainThread()) | 893 if (isMainThread()) |
| 894 ScriptForbiddenScope::exit(); | 894 ScriptForbiddenScope::exit(); |
| 895 } | 895 } |
| 896 | 896 |
| 897 #if defined(ADDRESS_SANITIZER) | 897 #if defined(ADDRESS_SANITIZER) |
| 898 // TODO(haraken): Currently we cannot enable the poisoning because we have | 898 // TODO(Oilpan): enable the poisoning always. |
| 899 // real bugs where destructors touch other on-heap objects. Remove all the bugs | 899 #if ENABLE(OILPAN |
|
tkent
2015/05/20 06:46:43
append ')'
Yuta Kitamura
2015/05/20 06:58:22
#if ENABLE(OILPAN
^
sof
2015/05/20 06:59:14
Oops, thanks for catching this.
| |
| 900 // and enable the poisoning. | |
| 901 #if 0 | |
| 902 for (int i = 0; i < NumberOfHeaps; i++) | 900 for (int i = 0; i < NumberOfHeaps; i++) |
| 903 m_heaps[i]->poisonUnmarkedObjects(); | 901 m_heaps[i]->poisonUnmarkedObjects(); |
| 904 #endif | 902 #endif |
| 905 #endif | 903 #endif |
| 906 | 904 |
| 907 #if ENABLE(OILPAN) | 905 #if ENABLE(OILPAN) |
| 908 if (gcState() == EagerSweepScheduled) { | 906 if (gcState() == EagerSweepScheduled) { |
| 909 // Eager sweeping should happen only in testing. | 907 // Eager sweeping should happen only in testing. |
| 910 setGCState(Sweeping); | 908 setGCState(Sweeping); |
| 911 completeSweep(); | 909 completeSweep(); |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1308 json->beginArray(it->key.ascii().data()); | 1306 json->beginArray(it->key.ascii().data()); |
| 1309 for (size_t age = 0; age <= maxHeapObjectAge; ++age) | 1307 for (size_t age = 0; age <= maxHeapObjectAge; ++age) |
| 1310 json->pushInteger(it->value.ages[age]); | 1308 json->pushInteger(it->value.ages[age]); |
| 1311 json->endArray(); | 1309 json->endArray(); |
| 1312 } | 1310 } |
| 1313 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release()); | 1311 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(TRACE_DISABLED_BY_DEFAULT("blink_gc"), s tatsName, this, json.release()); |
| 1314 } | 1312 } |
| 1315 #endif | 1313 #endif |
| 1316 | 1314 |
| 1317 } // namespace blink | 1315 } // namespace blink |
| OLD | NEW |