RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 06:27:45 +00:00
Code Issues Activity Actions

LibJS: Use IntrusiveList for keeping track of HandleImpls

Browse source 
This allows us to remove a HashTable from heap and cuts down on
some of the malloc traffic when creating handles.
This commit is contained in:
Andreas Kling 2021-07-21 19:45:21 +02:00
parent 8ea029405f
commit 746b310061
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibJS/Heap/Handle.h
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
#include <AK/Badge.h> #include <AK/Badge.h>
#include <AK/IntrusiveList.h>
#include <AK/Noncopyable.h> #include <AK/Noncopyable.h>
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
@ -30,6 +31,11 @@ private:
explicit HandleImpl(Cell*); explicit HandleImpl(Cell*);
Cell* m_cell { nullptr }; Cell* m_cell { nullptr };
IntrusiveListNode<HandleImpl> m_list_node;
public:
using List = IntrusiveList<HandleImpl, RawPtr<HandleImpl>, &HandleImpl::m_list_node>;
}; };
template<class T> template<class T>

12
Userland/Libraries/LibJS/Heap/Heap.cpp
View file

@ -91,8 +91,8 @@ void Heap::gather_roots(HashTable<Cell*>& roots)
vm().gather_roots(roots); vm().gather_roots(roots);
gather_conservative_roots(roots); gather_conservative_roots(roots);
for (auto* handle : m_handles) for (auto& handle : m_handles)
roots.set(handle->cell()); roots.set(handle.cell());
for (auto* list : m_marked_value_lists) { for (auto* list : m_marked_value_lists) {
for (auto& value : list->values()) { for (auto& value : list->values()) {
@ -258,14 +258,14 @@ void Heap::sweep_dead_cells(bool print_report, const Core::ElapsedTimer& measure
void Heap::did_create_handle(Badge<HandleImpl>, HandleImpl& impl) void Heap::did_create_handle(Badge<HandleImpl>, HandleImpl& impl)
{ {
VERIFY(!m_handles.contains(&impl)); VERIFY(!m_handles.contains(impl));
m_handles.set(&impl); m_handles.append(impl);
} }
void Heap::did_destroy_handle(Badge<HandleImpl>, HandleImpl& impl) void Heap::did_destroy_handle(Badge<HandleImpl>, HandleImpl& impl)
{ {
VERIFY(m_handles.contains(&impl)); VERIFY(m_handles.contains(impl));
m_handles.remove(&impl); m_handles.remove(impl);
} }
void Heap::did_create_marked_value_list(Badge<MarkedValueList>, MarkedValueList& list) void Heap::did_create_marked_value_list(Badge<MarkedValueList>, MarkedValueList& list)

4
Userland/Libraries/LibJS/Heap/Heap.h
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
#include <AK/HashTable.h> #include <AK/HashTable.h>
#include <AK/IntrusiveList.h>
#include <AK/Noncopyable.h> #include <AK/Noncopyable.h>
#include <AK/NonnullOwnPtr.h> #include <AK/NonnullOwnPtr.h>
#include <AK/Types.h> #include <AK/Types.h>
@ -105,7 +106,8 @@ private:
VM& m_vm; VM& m_vm;
Vector<NonnullOwnPtr<CellAllocator>> m_allocators; Vector<NonnullOwnPtr<CellAllocator>> m_allocators;
HashTable<HandleImpl*> m_handles;
HandleImpl::List m_handles;
HashTable<MarkedValueList*> m_marked_value_lists; HashTable<MarkedValueList*> m_marked_value_lists;