diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/heap/cppgc/heap.h | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/heap/cppgc/heap.h')
| -rw-r--r-- | chromium/v8/src/heap/cppgc/heap.h | 134 |
1 files changed, 19 insertions, 115 deletions
diff --git a/chromium/v8/src/heap/cppgc/heap.h b/chromium/v8/src/heap/cppgc/heap.h index fa19b74be53..f96f81e3217 100644 --- a/chromium/v8/src/heap/cppgc/heap.h +++ b/chromium/v8/src/heap/cppgc/heap.h @@ -5,143 +5,47 @@ #ifndef V8_HEAP_CPPGC_HEAP_H_ #define V8_HEAP_CPPGC_HEAP_H_ -#include <memory> -#include <vector> - #include "include/cppgc/heap.h" -#include "include/cppgc/internal/gc-info.h" -#include "include/cppgc/internal/persistent-node.h" #include "include/cppgc/liveness-broker.h" -#include "src/base/page-allocator.h" -#include "src/heap/cppgc/heap-object-header.h" -#include "src/heap/cppgc/marker.h" -#include "src/heap/cppgc/object-allocator.h" -#include "src/heap/cppgc/page-memory.h" -#include "src/heap/cppgc/prefinalizer-handler.h" -#include "src/heap/cppgc/raw-heap.h" -#include "src/heap/cppgc/sweeper.h" +#include "include/cppgc/macros.h" +#include "src/heap/cppgc/garbage-collector.h" +#include "src/heap/cppgc/gc-invoker.h" +#include "src/heap/cppgc/heap-base.h" +#include "src/heap/cppgc/heap-growing.h" namespace cppgc { namespace internal { -class Stack; - class V8_EXPORT_PRIVATE LivenessBrokerFactory { public: static LivenessBroker Create(); }; -class V8_EXPORT_PRIVATE Heap final : public cppgc::Heap { +class V8_EXPORT_PRIVATE Heap final : public HeapBase, + public cppgc::Heap, + public GarbageCollector { public: - // NoGCScope allows going over limits and avoids triggering garbage - // collection triggered through allocations or even explicitly. - class V8_EXPORT_PRIVATE NoGCScope final { - CPPGC_STACK_ALLOCATED(); - - public: - explicit NoGCScope(Heap* heap); - ~NoGCScope(); - - NoGCScope(const NoGCScope&) = delete; - NoGCScope& operator=(const NoGCScope&) = delete; - - private: - Heap* const heap_; - }; - - // NoAllocationScope is used in debug mode to catch unwanted allocations. E.g. - // allocations during GC. - class V8_EXPORT_PRIVATE NoAllocationScope final { - CPPGC_STACK_ALLOCATED(); - - public: - explicit NoAllocationScope(Heap* heap); - ~NoAllocationScope(); - - NoAllocationScope(const NoAllocationScope&) = delete; - NoAllocationScope& operator=(const NoAllocationScope&) = delete; - - private: - Heap* const heap_; - }; - - struct GCConfig { - using StackState = Heap::StackState; - - static GCConfig Default() { return {StackState::kMayContainHeapPointers}; } - - StackState stack_state = StackState::kMayContainHeapPointers; - }; - static Heap* From(cppgc::Heap* heap) { return static_cast<Heap*>(heap); } - - explicit Heap(size_t custom_spaces); - ~Heap() final; - - inline void* Allocate(size_t size, GCInfoIndex index); - inline void* Allocate(size_t size, GCInfoIndex index, - CustomSpaceIndex space_index); - - void CollectGarbage(GCConfig config = GCConfig::Default()); - - PreFinalizerHandler* prefinalizer_handler() { - return prefinalizer_handler_.get(); - } - - PersistentRegion& GetStrongPersistentRegion() { - return strong_persistent_region_; + static const Heap* From(const cppgc::Heap* heap) { + return static_cast<const Heap*>(heap); } - const PersistentRegion& GetStrongPersistentRegion() const { - return strong_persistent_region_; - } - PersistentRegion& GetWeakPersistentRegion() { - return weak_persistent_region_; - } - const PersistentRegion& GetWeakPersistentRegion() const { - return weak_persistent_region_; - } - - RawHeap& raw_heap() { return raw_heap_; } - const RawHeap& raw_heap() const { return raw_heap_; } - Stack* stack() { return stack_.get(); } - - PageBackend* page_backend() { return page_backend_.get(); } - const PageBackend* page_backend() const { return page_backend_.get(); } - - Sweeper& sweeper() { return sweeper_; } + Heap(std::shared_ptr<cppgc::Platform> platform, + cppgc::Heap::HeapOptions options); + ~Heap() final; - size_t epoch() const { return epoch_; } + HeapBase& AsBase() { return *this; } + const HeapBase& AsBase() const { return *this; } - size_t ObjectPayloadSize() const; + void CollectGarbage(Config config) final; - // Temporary getter until proper visitation of on-stack objects is - // implemented. - std::vector<HeapObjectHeader*>& objects() { return objects_; } + size_t epoch() const final { return epoch_; } private: - bool in_no_gc_scope() const { return no_gc_scope_ > 0; } - bool is_allocation_allowed() const { return no_allocation_scope_ == 0; } - - RawHeap raw_heap_; - - v8::base::PageAllocator system_allocator_; - std::unique_ptr<PageBackend> page_backend_; - ObjectAllocator object_allocator_; - Sweeper sweeper_; - - std::unique_ptr<Stack> stack_; - std::unique_ptr<PreFinalizerHandler> prefinalizer_handler_; - std::unique_ptr<Marker> marker_; - std::vector<HeapObjectHeader*> objects_; - - PersistentRegion strong_persistent_region_; - PersistentRegion weak_persistent_region_; + GCInvoker gc_invoker_; + HeapGrowing growing_; size_t epoch_ = 0; - - size_t no_gc_scope_ = 0; - size_t no_allocation_scope_ = 0; }; } // namespace internal |