| 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 27 matching lines...) Expand all Loading... |
| 38 #include "platform/heap/Heap.h" | 38 #include "platform/heap/Heap.h" |
| 39 #include "platform/heap/MarkingVisitor.h" | 39 #include "platform/heap/MarkingVisitor.h" |
| 40 #include "platform/heap/PageMemory.h" | 40 #include "platform/heap/PageMemory.h" |
| 41 #include "platform/heap/PagePool.h" | 41 #include "platform/heap/PagePool.h" |
| 42 #include "platform/heap/SafePoint.h" | 42 #include "platform/heap/SafePoint.h" |
| 43 #include "platform/heap/ThreadState.h" | 43 #include "platform/heap/ThreadState.h" |
| 44 #include "platform/web_memory_allocator_dump.h" | 44 #include "platform/web_memory_allocator_dump.h" |
| 45 #include "platform/web_process_memory_dump.h" | 45 #include "platform/web_process_memory_dump.h" |
| 46 #include "public/platform/Platform.h" | 46 #include "public/platform/Platform.h" |
| 47 #include "wtf/Assertions.h" | 47 #include "wtf/Assertions.h" |
| 48 #include "wtf/AutoReset.h" |
| 48 #include "wtf/ContainerAnnotations.h" | 49 #include "wtf/ContainerAnnotations.h" |
| 49 #include "wtf/CurrentTime.h" | 50 #include "wtf/CurrentTime.h" |
| 50 #include "wtf/LeakAnnotations.h" | 51 #include "wtf/LeakAnnotations.h" |
| 51 #include "wtf/TemporaryChange.h" | |
| 52 #include "wtf/allocator/PageAllocator.h" | 52 #include "wtf/allocator/PageAllocator.h" |
| 53 #include "wtf/allocator/Partitions.h" | 53 #include "wtf/allocator/Partitions.h" |
| 54 | 54 |
| 55 #ifdef ANNOTATE_CONTIGUOUS_CONTAINER | 55 #ifdef ANNOTATE_CONTIGUOUS_CONTAINER |
| 56 // FIXME: have ContainerAnnotations.h define an ENABLE_-style name instead. | 56 // FIXME: have ContainerAnnotations.h define an ENABLE_-style name instead. |
| 57 #define ENABLE_ASAN_CONTAINER_ANNOTATIONS 1 | 57 #define ENABLE_ASAN_CONTAINER_ANNOTATIONS 1 |
| 58 | 58 |
| 59 // When finalizing a non-inlined vector backing store/container, remove | 59 // When finalizing a non-inlined vector backing store/container, remove |
| 60 // its contiguous container annotation. Required as it will not be destructed | 60 // its contiguous container annotation. Required as it will not be destructed |
| 61 // from its Vector. | 61 // from its Vector. |
| (...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 ASSERT(pageFromObject(reinterpret_cast<Address>(header)) == findPageFromAddr
ess(reinterpret_cast<Address>(header))); | 685 ASSERT(pageFromObject(reinterpret_cast<Address>(header)) == findPageFromAddr
ess(reinterpret_cast<Address>(header))); |
| 686 m_promptlyFreedSize += shrinkSize; | 686 m_promptlyFreedSize += shrinkSize; |
| 687 header->setSize(allocationSize); | 687 header->setSize(allocationSize); |
| 688 SET_MEMORY_INACCESSIBLE(shrinkAddress + sizeof(HeapObjectHeader), shrinkSize
- sizeof(HeapObjectHeader)); | 688 SET_MEMORY_INACCESSIBLE(shrinkAddress + sizeof(HeapObjectHeader), shrinkSize
- sizeof(HeapObjectHeader)); |
| 689 return false; | 689 return false; |
| 690 } | 690 } |
| 691 | 691 |
| 692 Address NormalPageArena::lazySweepPages(size_t allocationSize, size_t gcInfoInde
x) | 692 Address NormalPageArena::lazySweepPages(size_t allocationSize, size_t gcInfoInde
x) |
| 693 { | 693 { |
| 694 ASSERT(!hasCurrentAllocationArea()); | 694 ASSERT(!hasCurrentAllocationArea()); |
| 695 TemporaryChange<bool> isLazySweeping(m_isLazySweeping, true); | 695 AutoReset<bool> isLazySweeping(&m_isLazySweeping, true); |
| 696 Address result = nullptr; | 696 Address result = nullptr; |
| 697 while (m_firstUnsweptPage) { | 697 while (m_firstUnsweptPage) { |
| 698 BasePage* page = m_firstUnsweptPage; | 698 BasePage* page = m_firstUnsweptPage; |
| 699 if (page->isEmpty()) { | 699 if (page->isEmpty()) { |
| 700 page->unlink(&m_firstUnsweptPage); | 700 page->unlink(&m_firstUnsweptPage); |
| 701 page->removeFromHeap(); | 701 page->removeFromHeap(); |
| 702 } else { | 702 } else { |
| 703 // Sweep a page and move the page from m_firstUnsweptPages to | 703 // Sweep a page and move the page from m_firstUnsweptPages to |
| 704 // m_firstPages. | 704 // m_firstPages. |
| 705 page->sweep(); | 705 page->sweep(); |
| (...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1616 | 1616 |
| 1617 m_hasEntries = true; | 1617 m_hasEntries = true; |
| 1618 size_t index = hash(address); | 1618 size_t index = hash(address); |
| 1619 ASSERT(!(index & 1)); | 1619 ASSERT(!(index & 1)); |
| 1620 Address cachePage = roundToBlinkPageStart(address); | 1620 Address cachePage = roundToBlinkPageStart(address); |
| 1621 m_entries[index + 1] = m_entries[index]; | 1621 m_entries[index + 1] = m_entries[index]; |
| 1622 m_entries[index] = cachePage; | 1622 m_entries[index] = cachePage; |
| 1623 } | 1623 } |
| 1624 | 1624 |
| 1625 } // namespace blink | 1625 } // namespace blink |
| OLD | NEW |