nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

microkernel: hot paths are pretty fucking hot

Browse source
This commit is contained in:
Michael Scire 2020-12-02 02:14:24 -08:00 committed by SciresM
parent 331fa1d00d
commit ab8de72db0
6 changed files with 199 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/libmesosphere/source/kern_k_page_table_base.cpp
View file

@ -3054,6 +3054,9 @@ namespace ams::kern {
return ResultSuccess(); return ResultSuccess();
} }
#pragma GCC push_options
#pragma GCC optimize ("-O2")
Result KPageTableBase::SetupForIpcClient(PageLinkedList *page_list, size_t *out_blocks_needed, KProcessAddress address, size_t size, KMemoryPermission test_perm, KMemoryState dst_state) { Result KPageTableBase::SetupForIpcClient(PageLinkedList *page_list, size_t *out_blocks_needed, KProcessAddress address, size_t size, KMemoryPermission test_perm, KMemoryState dst_state) {
/* Validate pre-conditions. */ /* Validate pre-conditions. */
MESOSPHERE_ASSERT(this->IsLockedByCurrentThread()); MESOSPHERE_ASSERT(this->IsLockedByCurrentThread());
@ -3707,6 +3710,8 @@ namespace ams::kern {
} }
} }
#pragma GCC pop_options
Result KPageTableBase::MapPhysicalMemory(KProcessAddress address, size_t size) { Result KPageTableBase::MapPhysicalMemory(KProcessAddress address, size_t size) {
/* Lock the physical memory lock. */ /* Lock the physical memory lock. */
KScopedLightLock phys_lk(this->map_physical_memory_lock); KScopedLightLock phys_lk(this->map_physical_memory_lock);

5
libraries/libmesosphere/source/kern_k_server_session.cpp
View file

@ -17,6 +17,9 @@
namespace ams::kern { namespace ams::kern {
#pragma GCC push_options
#pragma GCC optimize ("-O2")
namespace ipc { namespace ipc {
using MessageBuffer = ams::svc::ipc::MessageBuffer; using MessageBuffer = ams::svc::ipc::MessageBuffer;
@ -1362,4 +1365,6 @@ namespace ams::kern {
this->NotifyAvailable(svc::ResultSessionClosed()); this->NotifyAvailable(svc::ResultSessionClosed());
} }
#pragma GCC pop_options
} }

5
libraries/libmesosphere/source/svc/kern_svc_ipc.cpp
View file

@ -17,6 +17,9 @@
namespace ams::kern::svc { namespace ams::kern::svc {
#pragma GCC push_options
#pragma GCC optimize ("-O2")
/* ============================= Common ============================= */ /* ============================= Common ============================= */
namespace { namespace {
@ -304,4 +307,6 @@ namespace ams::kern::svc {
return ReplyAndReceiveWithUserBuffer(out_index, message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns); return ReplyAndReceiveWithUserBuffer(out_index, message_buffer, message_buffer_size, handles, num_handles, reply_target, timeout_ns);
} }
#pragma GCC pop_options
} }

5
libraries/libvapours/include/vapours/svc/ipc/svc_message_buffer.hpp
View file

@ -19,6 +19,9 @@
namespace ams::svc::ipc { namespace ams::svc::ipc {
#pragma GCC push_options
#pragma GCC optimize ("-O2")
ALWAYS_INLINE u32 *GetMessageBuffer() { ALWAYS_INLINE u32 *GetMessageBuffer() {
return GetThreadLocalRegion()->message_buffer; return GetThreadLocalRegion()->message_buffer;
} }
@ -545,4 +548,6 @@ namespace ams::svc::ipc {
} }
}; };
#pragma GCC pop_options
} }

208
libraries/libvapours/include/vapours/util/util_intrusive_list.hpp
View file

@ -38,17 +38,17 @@ namespace ams::util {
public: public:
constexpr IntrusiveListNode() : prev(this), next(this) { /* ... */ } constexpr IntrusiveListNode() : prev(this), next(this) { /* ... */ }
constexpr bool IsLinked() const { constexpr ALWAYS_INLINE bool IsLinked() const {
return this->next != this; return this->next != this;
} }
private: private:
void LinkPrev(IntrusiveListNode *node) { ALWAYS_INLINE void LinkPrev(IntrusiveListNode *node) {
/* We can't link an already linked node. */ /* We can't link an already linked node. */
AMS_ASSERT(!node->IsLinked()); AMS_ASSERT(!node->IsLinked());
this->SplicePrev(node, node); this->SplicePrev(node, node);
} }
void SplicePrev(IntrusiveListNode *first, IntrusiveListNode *last) { ALWAYS_INLINE void SplicePrev(IntrusiveListNode *first, IntrusiveListNode *last) {
/* Splice a range into the list. */ /* Splice a range into the list. */
auto last_prev = last->prev; auto last_prev = last->prev;
first->prev = this->prev; first->prev = this->prev;
@ -57,13 +57,13 @@ namespace ams::util {
this->prev = last_prev; this->prev = last_prev;
} }
void LinkNext(IntrusiveListNode *node) { ALWAYS_INLINE void LinkNext(IntrusiveListNode *node) {
/* We can't link an already linked node. */ /* We can't link an already linked node. */
AMS_ASSERT(!node->IsLinked()); AMS_ASSERT(!node->IsLinked());
return this->SpliceNext(node, node); return this->SpliceNext(node, node);
} }
void SpliceNext(IntrusiveListNode *first, IntrusiveListNode *last) { ALWAYS_INLINE void SpliceNext(IntrusiveListNode *first, IntrusiveListNode *last) {
/* Splice a range into the list. */ /* Splice a range into the list. */
auto last_prev = last->prev; auto last_prev = last->prev;
first->prev = this; first->prev = this;
@ -72,11 +72,11 @@ namespace ams::util {
this->next = first; this->next = first;
} }
void Unlink() { ALWAYS_INLINE void Unlink() {
this->Unlink(this->next); this->Unlink(this->next);
} }
void Unlink(IntrusiveListNode *last) { ALWAYS_INLINE void Unlink(IntrusiveListNode *last) {
/* Unlink a node from a next node. */ /* Unlink a node from a next node. */
auto last_prev = last->prev; auto last_prev = last->prev;
this->prev->next = last; this->prev->next = last;
@ -85,19 +85,19 @@ namespace ams::util {
this->prev = last_prev; this->prev = last_prev;
} }
IntrusiveListNode *GetPrev() { ALWAYS_INLINE IntrusiveListNode *GetPrev() {
return this->prev; return this->prev;
} }
const IntrusiveListNode *GetPrev() const { ALWAYS_INLINE const IntrusiveListNode *GetPrev() const {
return this->prev; return this->prev;
} }
IntrusiveListNode *GetNext() { ALWAYS_INLINE IntrusiveListNode *GetNext() {
return this->next; return this->next;
} }
const IntrusiveListNode *GetNext() const { ALWAYS_INLINE const IntrusiveListNode *GetNext() const {
return this->next; return this->next;
} }
}; };
@ -136,149 +136,149 @@ namespace ams::util {
private: private:
pointer node; pointer node;
public: public:
explicit Iterator(pointer n) : node(n) { /* ... */ } ALWAYS_INLINE explicit Iterator(pointer n) : node(n) { /* ... */ }
bool operator==(const Iterator &rhs) const { ALWAYS_INLINE bool operator==(const Iterator &rhs) const {
return this->node == rhs.node; return this->node == rhs.node;
} }
bool operator!=(const Iterator &rhs) const { ALWAYS_INLINE bool operator!=(const Iterator &rhs) const {
return !(*this == rhs); return !(*this == rhs);
} }
pointer operator->() const { ALWAYS_INLINE pointer operator->() const {
return this->node; return this->node;
} }
reference operator*() const { ALWAYS_INLINE reference operator*() const {
return *this->node; return *this->node;
} }
Iterator &operator++() { ALWAYS_INLINE Iterator &operator++() {
this->node = this->node->next; this->node = this->node->next;
return *this; return *this;
} }
Iterator &operator--() { ALWAYS_INLINE Iterator &operator--() {
this->node = this->node->prev; this->node = this->node->prev;
return *this; return *this;
} }
Iterator operator++(int) { ALWAYS_INLINE Iterator operator++(int) {
const Iterator it{*this}; const Iterator it{*this};
++(*this); ++(*this);
return it; return it;
} }
Iterator operator--(int) { ALWAYS_INLINE Iterator operator--(int) {
const Iterator it{*this}; const Iterator it{*this};
--(*this); --(*this);
return it; return it;
} }
operator Iterator<true>() const { ALWAYS_INLINE operator Iterator<true>() const {
return Iterator<true>(this->node); return Iterator<true>(this->node);
} }
Iterator<false> GetNonConstIterator() const { ALWAYS_INLINE Iterator<false> GetNonConstIterator() const {
return Iterator<false>(const_cast<IntrusiveListImpl::pointer>(this->node)); return Iterator<false>(const_cast<IntrusiveListImpl::pointer>(this->node));
} }
}; };
public: public:
constexpr IntrusiveListImpl() : root_node() { /* ... */ } constexpr ALWAYS_INLINE IntrusiveListImpl() : root_node() { /* ... */ }
/* Iterator accessors. */ /* Iterator accessors. */
iterator begin() { ALWAYS_INLINE iterator begin() {
return iterator(this->root_node.GetNext()); return iterator(this->root_node.GetNext());
} }
const_iterator begin() const { ALWAYS_INLINE const_iterator begin() const {
return const_iterator(this->root_node.GetNext()); return const_iterator(this->root_node.GetNext());
} }
iterator end() { ALWAYS_INLINE iterator end() {
return iterator(&this->root_node); return iterator(&this->root_node);
} }
const_iterator end() const { ALWAYS_INLINE const_iterator end() const {
return const_iterator(&this->root_node); return const_iterator(&this->root_node);
} }
iterator iterator_to(reference v) { ALWAYS_INLINE iterator iterator_to(reference v) {
/* Only allow iterator_to for values in lists. */ /* Only allow iterator_to for values in lists. */
AMS_ASSERT(v.IsLinked()); AMS_ASSERT(v.IsLinked());
return iterator(&v); return iterator(&v);
} }
const_iterator iterator_to(const_reference v) const { ALWAYS_INLINE const_iterator iterator_to(const_reference v) const {
/* Only allow iterator_to for values in lists. */ /* Only allow iterator_to for values in lists. */
AMS_ASSERT(v.IsLinked()); AMS_ASSERT(v.IsLinked());
return const_iterator(&v); return const_iterator(&v);
} }
/* Content management. */ /* Content management. */
bool empty() const { ALWAYS_INLINE bool empty() const {
return !this->root_node.IsLinked(); return !this->root_node.IsLinked();
} }
size_type size() const { ALWAYS_INLINE size_type size() const {
return static_cast<size_type>(std::distance(this->begin(), this->end())); return static_cast<size_type>(std::distance(this->begin(), this->end()));
} }
reference back() { ALWAYS_INLINE reference back() {
return *this->root_node.GetPrev(); return *this->root_node.GetPrev();
} }
const_reference back() const { ALWAYS_INLINE const_reference back() const {
return *this->root_node.GetPrev(); return *this->root_node.GetPrev();
} }
reference front() { ALWAYS_INLINE reference front() {
return *this->root_node.GetNext(); return *this->root_node.GetNext();
} }
const_reference front() const { ALWAYS_INLINE const_reference front() const {
return *this->root_node.GetNext(); return *this->root_node.GetNext();
} }
void push_back(reference node) { ALWAYS_INLINE void push_back(reference node) {
this->root_node.LinkPrev(&node); this->root_node.LinkPrev(&node);
} }
void push_front(reference node) { ALWAYS_INLINE void push_front(reference node) {
this->root_node.LinkNext(&node); this->root_node.LinkNext(&node);
} }
void pop_back() { ALWAYS_INLINE void pop_back() {
this->root_node.GetPrev()->Unlink(); this->root_node.GetPrev()->Unlink();
} }
void pop_front() { ALWAYS_INLINE void pop_front() {
this->root_node.GetNext()->Unlink(); this->root_node.GetNext()->Unlink();
} }
iterator insert(const_iterator pos, reference node) { ALWAYS_INLINE iterator insert(const_iterator pos, reference node) {
pos.GetNonConstIterator()->LinkPrev(&node); pos.GetNonConstIterator()->LinkPrev(&node);
return iterator(&node); return iterator(&node);
} }
void splice(const_iterator pos, IntrusiveListImpl &o) { ALWAYS_INLINE void splice(const_iterator pos, IntrusiveListImpl &o) {
splice_impl(pos, o.begin(), o.end()); splice_impl(pos, o.begin(), o.end());
} }
void splice(const_iterator pos, IntrusiveListImpl &o, const_iterator first) { ALWAYS_INLINE void splice(const_iterator pos, IntrusiveListImpl &o, const_iterator first) {
AMS_UNUSED(o); AMS_UNUSED(o);
const_iterator last(first); const_iterator last(first);
std::advance(last, 1); std::advance(last, 1);
splice_impl(pos, first, last); splice_impl(pos, first, last);
} }
void splice(const_iterator pos, IntrusiveListImpl &o, const_iterator first, const_iterator last) { ALWAYS_INLINE void splice(const_iterator pos, IntrusiveListImpl &o, const_iterator first, const_iterator last) {
AMS_UNUSED(o); AMS_UNUSED(o);
splice_impl(pos, first, last); splice_impl(pos, first, last);
} }
iterator erase(const_iterator pos) { ALWAYS_INLINE iterator erase(const_iterator pos) {
if (pos == this->end()) { if (pos == this->end()) {
return this->end(); return this->end();
} }
@ -287,13 +287,13 @@ namespace ams::util {
return it; return it;
} }
void clear() { ALWAYS_INLINE void clear() {
while (!this->empty()) { while (!this->empty()) {
this->pop_front(); this->pop_front();
} }
} }
private: private:
void splice_impl(const_iterator _pos, const_iterator _first, const_iterator _last) { ALWAYS_INLINE void splice_impl(const_iterator _pos, const_iterator _first, const_iterator _last) {
if (_first == _last) { if (_first == _last) {
return; return;
} }
@ -344,198 +344,198 @@ namespace ams::util {
private: private:
ImplIterator iterator; ImplIterator iterator;
private: private:
explicit Iterator(ImplIterator it) : iterator(it) { /* ... */ } explicit ALWAYS_INLINE Iterator(ImplIterator it) : iterator(it) { /* ... */ }
ImplIterator GetImplIterator() const { ALWAYS_INLINE ImplIterator GetImplIterator() const {
return this->iterator; return this->iterator;
} }
public: public:
bool operator==(const Iterator &rhs) const { ALWAYS_INLINE bool operator==(const Iterator &rhs) const {
return this->iterator == rhs.iterator; return this->iterator == rhs.iterator;
} }
bool operator!=(const Iterator &rhs) const { ALWAYS_INLINE bool operator!=(const Iterator &rhs) const {
return !(*this == rhs); return !(*this == rhs);
} }
pointer operator->() const { ALWAYS_INLINE pointer operator->() const {
return &Traits::GetParent(*this->iterator); return &Traits::GetParent(*this->iterator);
} }
reference operator*() const { ALWAYS_INLINE reference operator*() const {
return Traits::GetParent(*this->iterator); return Traits::GetParent(*this->iterator);
} }
Iterator &operator++() { ALWAYS_INLINE Iterator &operator++() {
++this->iterator; ++this->iterator;
return *this; return *this;
} }
Iterator &operator--() { ALWAYS_INLINE Iterator &operator--() {
--this->iterator; --this->iterator;
return *this; return *this;
} }
Iterator operator++(int) { ALWAYS_INLINE Iterator operator++(int) {
const Iterator it{*this}; const Iterator it{*this};
++this->iterator; ++this->iterator;
return it; return it;
} }
Iterator operator--(int) { ALWAYS_INLINE Iterator operator--(int) {
const Iterator it{*this}; const Iterator it{*this};
--this->iterator; --this->iterator;
return it; return it;
} }
operator Iterator<true>() const { ALWAYS_INLINE operator Iterator<true>() const {
return Iterator<true>(this->iterator); return Iterator<true>(this->iterator);
} }
}; };
private: private:
static constexpr IntrusiveListNode &GetNode(reference ref) { static constexpr ALWAYS_INLINE IntrusiveListNode &GetNode(reference ref) {
return Traits::GetNode(ref); return Traits::GetNode(ref);
} }
static constexpr IntrusiveListNode const &GetNode(const_reference ref) { static constexpr ALWAYS_INLINE IntrusiveListNode const &GetNode(const_reference ref) {
return Traits::GetNode(ref); return Traits::GetNode(ref);
} }
static constexpr reference GetParent(IntrusiveListNode &node) { static constexpr ALWAYS_INLINE reference GetParent(IntrusiveListNode &node) {
return Traits::GetParent(node); return Traits::GetParent(node);
} }
static constexpr const_reference GetParent(IntrusiveListNode const &node) { static constexpr ALWAYS_INLINE const_reference GetParent(IntrusiveListNode const &node) {
return Traits::GetParent(node); return Traits::GetParent(node);
} }
public: public:
constexpr IntrusiveList() : impl() { /* ... */ } constexpr ALWAYS_INLINE IntrusiveList() : impl() { /* ... */ }
/* Iterator accessors. */ /* Iterator accessors. */
iterator begin() { ALWAYS_INLINE iterator begin() {
return iterator(this->impl.begin()); return iterator(this->impl.begin());
} }
const_iterator begin() const { ALWAYS_INLINE const_iterator begin() const {
return const_iterator(this->impl.begin()); return const_iterator(this->impl.begin());
} }
iterator end() { ALWAYS_INLINE iterator end() {
return iterator(this->impl.end()); return iterator(this->impl.end());
} }
const_iterator end() const { ALWAYS_INLINE const_iterator end() const {
return const_iterator(this->impl.end()); return const_iterator(this->impl.end());
} }
const_iterator cbegin() const { ALWAYS_INLINE const_iterator cbegin() const {
return this->begin(); return this->begin();
} }
const_iterator cend() const { ALWAYS_INLINE const_iterator cend() const {
return this->end(); return this->end();
} }
reverse_iterator rbegin() { ALWAYS_INLINE reverse_iterator rbegin() {
return reverse_iterator(this->end()); return reverse_iterator(this->end());
} }
const_reverse_iterator rbegin() const { ALWAYS_INLINE const_reverse_iterator rbegin() const {
return const_reverse_iterator(this->end()); return const_reverse_iterator(this->end());
} }
reverse_iterator rend() { ALWAYS_INLINE reverse_iterator rend() {
return reverse_iterator(this->begin()); return reverse_iterator(this->begin());
} }
const_reverse_iterator rend() const { ALWAYS_INLINE const_reverse_iterator rend() const {
return const_reverse_iterator(this->begin()); return const_reverse_iterator(this->begin());
} }
const_reverse_iterator crbegin() const { ALWAYS_INLINE const_reverse_iterator crbegin() const {
return this->rbegin(); return this->rbegin();
} }
const_reverse_iterator crend() const { ALWAYS_INLINE const_reverse_iterator crend() const {
return this->rend(); return this->rend();
} }
iterator iterator_to(reference v) { ALWAYS_INLINE iterator iterator_to(reference v) {
return iterator(this->impl.iterator_to(GetNode(v))); return iterator(this->impl.iterator_to(GetNode(v)));
} }
const_iterator iterator_to(const_reference v) const { ALWAYS_INLINE const_iterator iterator_to(const_reference v) const {
return const_iterator(this->impl.iterator_to(GetNode(v))); return const_iterator(this->impl.iterator_to(GetNode(v)));
} }
/* Content management. */ /* Content management. */
bool empty() const { ALWAYS_INLINE bool empty() const {
return this->impl.empty(); return this->impl.empty();
} }
size_type size() const { ALWAYS_INLINE size_type size() const {
return this->impl.size(); return this->impl.size();
} }
reference back() { ALWAYS_INLINE reference back() {
AMS_ASSERT(!this->impl.empty()); AMS_ASSERT(!this->impl.empty());
return GetParent(this->impl.back()); return GetParent(this->impl.back());
} }
const_reference back() const { ALWAYS_INLINE const_reference back() const {
AMS_ASSERT(!this->impl.empty()); AMS_ASSERT(!this->impl.empty());
return GetParent(this->impl.back()); return GetParent(this->impl.back());
} }
reference front() { ALWAYS_INLINE reference front() {
AMS_ASSERT(!this->impl.empty()); AMS_ASSERT(!this->impl.empty());
return GetParent(this->impl.front()); return GetParent(this->impl.front());
} }
const_reference front() const { ALWAYS_INLINE const_reference front() const {
AMS_ASSERT(!this->impl.empty()); AMS_ASSERT(!this->impl.empty());
return GetParent(this->impl.front()); return GetParent(this->impl.front());
} }
void push_back(reference ref) { ALWAYS_INLINE void push_back(reference ref) {
this->impl.push_back(GetNode(ref)); this->impl.push_back(GetNode(ref));
} }
void push_front(reference ref) { ALWAYS_INLINE void push_front(reference ref) {
this->impl.push_front(GetNode(ref)); this->impl.push_front(GetNode(ref));
} }
void pop_back() { ALWAYS_INLINE void pop_back() {
AMS_ASSERT(!this->impl.empty()); AMS_ASSERT(!this->impl.empty());
this->impl.pop_back(); this->impl.pop_back();
} }
void pop_front() { ALWAYS_INLINE void pop_front() {
AMS_ASSERT(!this->impl.empty()); AMS_ASSERT(!this->impl.empty());
this->impl.pop_front(); this->impl.pop_front();
} }
iterator insert(const_iterator pos, reference ref) { ALWAYS_INLINE iterator insert(const_iterator pos, reference ref) {
return iterator(this->impl.insert(pos.GetImplIterator(), GetNode(ref))); return iterator(this->impl.insert(pos.GetImplIterator(), GetNode(ref)));
} }
void splice(const_iterator pos, IntrusiveList &o) { ALWAYS_INLINE void splice(const_iterator pos, IntrusiveList &o) {
this->impl.splice(pos.GetImplIterator(), o.impl); this->impl.splice(pos.GetImplIterator(), o.impl);
} }
void splice(const_iterator pos, IntrusiveList &o, const_iterator first) { ALWAYS_INLINE void splice(const_iterator pos, IntrusiveList &o, const_iterator first) {
this->impl.splice(pos.GetImplIterator(), o.impl, first.GetImplIterator()); this->impl.splice(pos.GetImplIterator(), o.impl, first.GetImplIterator());
} }
void splice(const_iterator pos, IntrusiveList &o, const_iterator first, const_iterator last) { ALWAYS_INLINE void splice(const_iterator pos, IntrusiveList &o, const_iterator first, const_iterator last) {
this->impl.splice(pos.GetImplIterator(), o.impl, first.GetImplIterator(), last.GetImplIterator()); this->impl.splice(pos.GetImplIterator(), o.impl, first.GetImplIterator(), last.GetImplIterator());
} }
iterator erase(const_iterator pos) { ALWAYS_INLINE iterator erase(const_iterator pos) {
return iterator(this->impl.erase(pos.GetImplIterator())); return iterator(this->impl.erase(pos.GetImplIterator()));
} }
void clear() { ALWAYS_INLINE void clear() {
this->impl.clear(); this->impl.clear();
} }
}; };
@ -550,19 +550,19 @@ namespace ams::util {
private: private:
friend class IntrusiveList<Derived, IntrusiveListMemberTraits>; friend class IntrusiveList<Derived, IntrusiveListMemberTraits>;
static constexpr IntrusiveListNode &GetNode(Derived &parent) { static constexpr ALWAYS_INLINE IntrusiveListNode &GetNode(Derived &parent) {
return parent.*Member; return parent.*Member;
} }
static constexpr IntrusiveListNode const &GetNode(Derived const &parent) { static constexpr ALWAYS_INLINE IntrusiveListNode const &GetNode(Derived const &parent) {
return parent.*Member; return parent.*Member;
} }
static constexpr Derived &GetParent(IntrusiveListNode &node) { static constexpr ALWAYS_INLINE Derived &GetParent(IntrusiveListNode &node) {
return util::GetParentReference<Member, Derived>(&node); return util::GetParentReference<Member, Derived>(&node);
} }
static constexpr Derived const &GetParent(IntrusiveListNode const &node) { static constexpr ALWAYS_INLINE Derived const &GetParent(IntrusiveListNode const &node) {
return util::GetParentReference<Member, Derived>(&node); return util::GetParentReference<Member, Derived>(&node);
} }
private: private:
@ -585,19 +585,19 @@ namespace ams::util {
private: private:
friend class IntrusiveList<Derived, IntrusiveListMemberTraitsDeferredAssert>; friend class IntrusiveList<Derived, IntrusiveListMemberTraitsDeferredAssert>;
static constexpr IntrusiveListNode &GetNode(Derived &parent) { static constexpr ALWAYS_INLINE IntrusiveListNode &GetNode(Derived &parent) {
return parent.*Member; return parent.*Member;
} }
static constexpr IntrusiveListNode const &GetNode(Derived const &parent) { static constexpr ALWAYS_INLINE IntrusiveListNode const &GetNode(Derived const &parent) {
return parent.*Member; return parent.*Member;
} }
static constexpr Derived &GetParent(IntrusiveListNode &node) { static constexpr ALWAYS_INLINE Derived &GetParent(IntrusiveListNode &node) {
return util::GetParentReference<Member, Derived>(&node); return util::GetParentReference<Member, Derived>(&node);
} }
static constexpr Derived const &GetParent(IntrusiveListNode const &node) { static constexpr ALWAYS_INLINE Derived const &GetParent(IntrusiveListNode const &node) {
return util::GetParentReference<Member, Derived>(&node); return util::GetParentReference<Member, Derived>(&node);
} }
}; };
@ -612,19 +612,19 @@ namespace ams::util {
private: private:
friend class IntrusiveList<Derived, IntrusiveListBaseTraits>; friend class IntrusiveList<Derived, IntrusiveListBaseTraits>;
static constexpr IntrusiveListNode &GetNode(Derived &parent) { static constexpr ALWAYS_INLINE IntrusiveListNode &GetNode(Derived &parent) {
return static_cast<IntrusiveListNode &>(parent); return static_cast<IntrusiveListNode &>(parent);
} }
static constexpr IntrusiveListNode const &GetNode(Derived const &parent) { static constexpr ALWAYS_INLINE IntrusiveListNode const &GetNode(Derived const &parent) {
return static_cast<const IntrusiveListNode &>(parent); return static_cast<const IntrusiveListNode &>(parent);
} }
static constexpr Derived &GetParent(IntrusiveListNode &node) { static constexpr ALWAYS_INLINE Derived &GetParent(IntrusiveListNode &node) {
return static_cast<Derived &>(node); return static_cast<Derived &>(node);
} }
static constexpr Derived const &GetParent(IntrusiveListNode const &node) { static constexpr ALWAYS_INLINE Derived const &GetParent(IntrusiveListNode const &node) {
return static_cast<const Derived &>(node); return static_cast<const Derived &>(node);
} }
}; };

150
libraries/libvapours/include/vapours/util/util_intrusive_red_black_tree.hpp
View file

@ -84,45 +84,45 @@ namespace ams::util {
public: public:
explicit Iterator(pointer n) : node(n) { /* ... */ } explicit Iterator(pointer n) : node(n) { /* ... */ }
bool operator==(const Iterator &rhs) const { ALWAYS_INLINE bool operator==(const Iterator &rhs) const {
return this->node == rhs.node; return this->node == rhs.node;
} }
bool operator!=(const Iterator &rhs) const { ALWAYS_INLINE bool operator!=(const Iterator &rhs) const {
return !(*this == rhs); return !(*this == rhs);
} }
pointer operator->() const { ALWAYS_INLINE pointer operator->() const {
return this->node; return this->node;
} }
reference operator*() const { ALWAYS_INLINE reference operator*() const {
return *this->node; return *this->node;
} }
Iterator &operator++() { ALWAYS_INLINE Iterator &operator++() {
this->node = GetNext(this->node); this->node = GetNext(this->node);
return *this; return *this;
} }
Iterator &operator--() { ALWAYS_INLINE Iterator &operator--() {
this->node = GetPrev(this->node); this->node = GetPrev(this->node);
return *this; return *this;
} }
Iterator operator++(int) { ALWAYS_INLINE Iterator operator++(int) {
const Iterator it{*this}; const Iterator it{*this};
++(*this); ++(*this);
return it; return it;
} }
Iterator operator--(int) { ALWAYS_INLINE Iterator operator--(int) {
const Iterator it{*this}; const Iterator it{*this};
--(*this); --(*this);
return it; return it;
} }
operator Iterator<true>() const { ALWAYS_INLINE operator Iterator<true>() const {
return Iterator<true>(this->node); return Iterator<true>(this->node);
} }
}; };
@ -135,27 +135,27 @@ namespace ams::util {
RB_INIT(&this->root); RB_INIT(&this->root);
} }
bool EmptyImpl() const { ALWAYS_INLINE bool EmptyImpl() const {
return RB_EMPTY(&this->root); return RB_EMPTY(&this->root);
} }
IntrusiveRedBlackTreeNode *GetMinImpl() const { ALWAYS_INLINE IntrusiveRedBlackTreeNode *GetMinImpl() const {
return RB_MIN(IntrusiveRedBlackTreeRoot, const_cast<IntrusiveRedBlackTreeRoot *>(&this->root)); return RB_MIN(IntrusiveRedBlackTreeRoot, const_cast<IntrusiveRedBlackTreeRoot *>(&this->root));
} }
IntrusiveRedBlackTreeNode *GetMaxImpl() const { ALWAYS_INLINE IntrusiveRedBlackTreeNode *GetMaxImpl() const {
return RB_MAX(IntrusiveRedBlackTreeRoot, const_cast<IntrusiveRedBlackTreeRoot *>(&this->root)); return RB_MAX(IntrusiveRedBlackTreeRoot, const_cast<IntrusiveRedBlackTreeRoot *>(&this->root));
} }
IntrusiveRedBlackTreeNode *RemoveImpl(IntrusiveRedBlackTreeNode *node) { ALWAYS_INLINE IntrusiveRedBlackTreeNode *RemoveImpl(IntrusiveRedBlackTreeNode *node) {
return RB_REMOVE(IntrusiveRedBlackTreeRoot, &this->root, node); return RB_REMOVE(IntrusiveRedBlackTreeRoot, &this->root, node);
} }
public: public:
static IntrusiveRedBlackTreeNode *GetNext(IntrusiveRedBlackTreeNode *node) { static ALWAYS_INLINE IntrusiveRedBlackTreeNode *GetNext(IntrusiveRedBlackTreeNode *node) {
return RB_NEXT(IntrusiveRedBlackTreeRoot, nullptr, node); return RB_NEXT(IntrusiveRedBlackTreeRoot, nullptr, node);
} }
static IntrusiveRedBlackTreeNode *GetPrev(IntrusiveRedBlackTreeNode *node) { static ALWAYS_INLINE IntrusiveRedBlackTreeNode *GetPrev(IntrusiveRedBlackTreeNode *node) {
return RB_PREV(IntrusiveRedBlackTreeRoot, nullptr, node); return RB_PREV(IntrusiveRedBlackTreeRoot, nullptr, node);
} }
@ -167,65 +167,65 @@ namespace ams::util {
return static_cast<const IntrusiveRedBlackTreeNode *>(GetPrev(const_cast<IntrusiveRedBlackTreeNode *>(node))); return static_cast<const IntrusiveRedBlackTreeNode *>(GetPrev(const_cast<IntrusiveRedBlackTreeNode *>(node)));
} }
public: public:
constexpr IntrusiveRedBlackTreeImpl() : root() { ALWAYS_INLINE constexpr IntrusiveRedBlackTreeImpl() : root() {
this->InitializeImpl(); this->InitializeImpl();
} }
/* Iterator accessors. */ /* Iterator accessors. */
iterator begin() { ALWAYS_INLINE iterator begin() {
return iterator(this->GetMinImpl()); return iterator(this->GetMinImpl());
} }
const_iterator begin() const { ALWAYS_INLINE const_iterator begin() const {
return const_iterator(this->GetMinImpl()); return const_iterator(this->GetMinImpl());
} }
iterator end() { ALWAYS_INLINE iterator end() {
return iterator(static_cast<IntrusiveRedBlackTreeNode *>(nullptr)); return iterator(static_cast<IntrusiveRedBlackTreeNode *>(nullptr));
} }
const_iterator end() const { ALWAYS_INLINE const_iterator end() const {
return const_iterator(static_cast<const IntrusiveRedBlackTreeNode *>(nullptr)); return const_iterator(static_cast<const IntrusiveRedBlackTreeNode *>(nullptr));
} }
const_iterator cbegin() const { ALWAYS_INLINE const_iterator cbegin() const {
return this->begin(); return this->begin();
} }
const_iterator cend() const { ALWAYS_INLINE const_iterator cend() const {
return this->end(); return this->end();
} }
iterator iterator_to(reference ref) { ALWAYS_INLINE iterator iterator_to(reference ref) {
return iterator(&ref); return iterator(&ref);
} }
const_iterator iterator_to(const_reference ref) const { ALWAYS_INLINE const_iterator iterator_to(const_reference ref) const {
return const_iterator(&ref); return const_iterator(&ref);
} }
/* Content management. */ /* Content management. */
bool empty() const { ALWAYS_INLINE bool empty() const {
return this->EmptyImpl(); return this->EmptyImpl();
} }
reference back() { ALWAYS_INLINE reference back() {
return *this->GetMaxImpl(); return *this->GetMaxImpl();
} }
const_reference back() const { ALWAYS_INLINE const_reference back() const {
return *this->GetMaxImpl(); return *this->GetMaxImpl();
} }
reference front() { ALWAYS_INLINE reference front() {
return *this->GetMinImpl(); return *this->GetMinImpl();
} }
const_reference front() const { ALWAYS_INLINE const_reference front() const {
return *this->GetMinImpl(); return *this->GetMinImpl();
} }
iterator erase(iterator it) { ALWAYS_INLINE iterator erase(iterator it) {
auto cur = std::addressof(*it); auto cur = std::addressof(*it);
auto next = GetNext(cur); auto next = GetNext(cur);
this->RemoveImpl(cur); this->RemoveImpl(cur);
@ -306,45 +306,45 @@ namespace ams::util {
return this->iterator; return this->iterator;
} }
public: public:
bool operator==(const Iterator &rhs) const { ALWAYS_INLINE bool operator==(const Iterator &rhs) const {
return this->iterator == rhs.iterator; return this->iterator == rhs.iterator;
} }
bool operator!=(const Iterator &rhs) const { ALWAYS_INLINE bool operator!=(const Iterator &rhs) const {
return !(*this == rhs); return !(*this == rhs);
} }
pointer operator->() const { ALWAYS_INLINE pointer operator->() const {
return Traits::GetParent(std::addressof(*this->iterator)); return Traits::GetParent(std::addressof(*this->iterator));
} }
reference operator*() const { ALWAYS_INLINE reference operator*() const {
return *Traits::GetParent(std::addressof(*this->iterator)); return *Traits::GetParent(std::addressof(*this->iterator));
} }
Iterator &operator++() { ALWAYS_INLINE Iterator &operator++() {
++this->iterator; ++this->iterator;
return *this; return *this;
} }
Iterator &operator--() { ALWAYS_INLINE Iterator &operator--() {
--this->iterator; --this->iterator;
return *this; return *this;
} }
Iterator operator++(int) { ALWAYS_INLINE Iterator operator++(int) {
const Iterator it{*this}; const Iterator it{*this};
++this->iterator; ++this->iterator;
return it; return it;
} }
Iterator operator--(int) { ALWAYS_INLINE Iterator operator--(int) {
const Iterator it{*this}; const Iterator it{*this};
--this->iterator; --this->iterator;
return it; return it;
} }
operator Iterator<true>() const { ALWAYS_INLINE operator Iterator<true>() const {
return Iterator<true>(this->iterator); return Iterator<true>(this->iterator);
} }
}; };
@ -361,105 +361,105 @@ namespace ams::util {
} }
/* Define accessors using RB_* functions. */ /* Define accessors using RB_* functions. */
IntrusiveRedBlackTreeNode *InsertImpl(IntrusiveRedBlackTreeNode *node) { ALWAYS_INLINE IntrusiveRedBlackTreeNode *InsertImpl(IntrusiveRedBlackTreeNode *node) {
return RB_INSERT(IntrusiveRedBlackTreeRootWithCompare, static_cast<IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root), node); return RB_INSERT(IntrusiveRedBlackTreeRootWithCompare, static_cast<IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root), node);
} }
IntrusiveRedBlackTreeNode *FindImpl(IntrusiveRedBlackTreeNode const *node) const { ALWAYS_INLINE IntrusiveRedBlackTreeNode *FindImpl(IntrusiveRedBlackTreeNode const *node) const {
return RB_FIND(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), const_cast<IntrusiveRedBlackTreeNode *>(node)); return RB_FIND(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), const_cast<IntrusiveRedBlackTreeNode *>(node));
} }
IntrusiveRedBlackTreeNode *NFindImpl(IntrusiveRedBlackTreeNode const *node) const { ALWAYS_INLINE IntrusiveRedBlackTreeNode *NFindImpl(IntrusiveRedBlackTreeNode const *node) const {
return RB_NFIND(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), const_cast<IntrusiveRedBlackTreeNode *>(node)); return RB_NFIND(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), const_cast<IntrusiveRedBlackTreeNode *>(node));
} }
IntrusiveRedBlackTreeNode *FindLightImpl(const_light_pointer lelm) const { ALWAYS_INLINE IntrusiveRedBlackTreeNode *FindLightImpl(const_light_pointer lelm) const {
return RB_FIND_LIGHT(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), static_cast<const void *>(lelm)); return RB_FIND_LIGHT(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), static_cast<const void *>(lelm));
} }
IntrusiveRedBlackTreeNode *NFindLightImpl(const_light_pointer lelm) const { ALWAYS_INLINE IntrusiveRedBlackTreeNode *NFindLightImpl(const_light_pointer lelm) const {
return RB_NFIND_LIGHT(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), static_cast<const void *>(lelm)); return RB_NFIND_LIGHT(IntrusiveRedBlackTreeRootWithCompare, const_cast<IntrusiveRedBlackTreeRootWithCompare *>(static_cast<const IntrusiveRedBlackTreeRootWithCompare *>(&this->impl.root)), static_cast<const void *>(lelm));
} }
public: public:
constexpr ALWAYS_INLINE IntrusiveRedBlackTree() : impl() { /* ... */ } constexpr ALWAYS_INLINE IntrusiveRedBlackTree() : impl() { /* ... */ }
/* Iterator accessors. */ /* Iterator accessors. */
iterator begin() { ALWAYS_INLINE iterator begin() {
return iterator(this->impl.begin()); return iterator(this->impl.begin());
} }
const_iterator begin() const { ALWAYS_INLINE const_iterator begin() const {
return const_iterator(this->impl.begin()); return const_iterator(this->impl.begin());
} }
iterator end() { ALWAYS_INLINE iterator end() {
return iterator(this->impl.end()); return iterator(this->impl.end());
} }
const_iterator end() const { ALWAYS_INLINE const_iterator end() const {
return const_iterator(this->impl.end()); return const_iterator(this->impl.end());
} }
const_iterator cbegin() const { ALWAYS_INLINE const_iterator cbegin() const {
return this->begin(); return this->begin();
} }
const_iterator cend() const { ALWAYS_INLINE const_iterator cend() const {
return this->end(); return this->end();
} }
iterator iterator_to(reference ref) { ALWAYS_INLINE iterator iterator_to(reference ref) {
return iterator(this->impl.iterator_to(*Traits::GetNode(std::addressof(ref)))); return iterator(this->impl.iterator_to(*Traits::GetNode(std::addressof(ref))));
} }
const_iterator iterator_to(const_reference ref) const { ALWAYS_INLINE const_iterator iterator_to(const_reference ref) const {
return const_iterator(this->impl.iterator_to(*Traits::GetNode(std::addressof(ref)))); return const_iterator(this->impl.iterator_to(*Traits::GetNode(std::addressof(ref))));
} }
/* Content management. */ /* Content management. */
bool empty() const { ALWAYS_INLINE bool empty() const {
return this->impl.empty(); return this->impl.empty();
} }
reference back() { ALWAYS_INLINE reference back() {
return *Traits::GetParent(std::addressof(this->impl.back())); return *Traits::GetParent(std::addressof(this->impl.back()));
} }
const_reference back() const { ALWAYS_INLINE const_reference back() const {
return *Traits::GetParent(std::addressof(this->impl.back())); return *Traits::GetParent(std::addressof(this->impl.back()));
} }
reference front() { ALWAYS_INLINE reference front() {
return *Traits::GetParent(std::addressof(this->impl.front())); return *Traits::GetParent(std::addressof(this->impl.front()));
} }
const_reference front() const { ALWAYS_INLINE const_reference front() const {
return *Traits::GetParent(std::addressof(this->impl.front())); return *Traits::GetParent(std::addressof(this->impl.front()));
} }
iterator erase(iterator it) { ALWAYS_INLINE iterator erase(iterator it) {
return iterator(this->impl.erase(it.GetImplIterator())); return iterator(this->impl.erase(it.GetImplIterator()));
} }
iterator insert(reference ref) { ALWAYS_INLINE iterator insert(reference ref) {
ImplType::pointer node = Traits::GetNode(std::addressof(ref)); ImplType::pointer node = Traits::GetNode(std::addressof(ref));
this->InsertImpl(node); this->InsertImpl(node);
return iterator(node); return iterator(node);
} }
iterator find(const_reference ref) const { ALWAYS_INLINE iterator find(const_reference ref) const {
return iterator(this->FindImpl(Traits::GetNode(std::addressof(ref)))); return iterator(this->FindImpl(Traits::GetNode(std::addressof(ref))));
} }
iterator nfind(const_reference ref) const { ALWAYS_INLINE iterator nfind(const_reference ref) const {
return iterator(this->NFindImpl(Traits::GetNode(std::addressof(ref)))); return iterator(this->NFindImpl(Traits::GetNode(std::addressof(ref))));
} }
iterator find_light(const_light_reference ref) const { ALWAYS_INLINE iterator find_light(const_light_reference ref) const {
return iterator(this->FindLightImpl(std::addressof(ref))); return iterator(this->FindLightImpl(std::addressof(ref)));
} }
iterator nfind_light(const_light_reference ref) const { ALWAYS_INLINE iterator nfind_light(const_light_reference ref) const {
return iterator(this->NFindLightImpl(std::addressof(ref))); return iterator(this->NFindLightImpl(std::addressof(ref)));
} }
}; };
@ -479,19 +479,19 @@ namespace ams::util {
friend class impl::IntrusiveRedBlackTreeImpl; friend class impl::IntrusiveRedBlackTreeImpl;
static constexpr IntrusiveRedBlackTreeNode *GetNode(Derived *parent) { static constexpr ALWAYS_INLINE IntrusiveRedBlackTreeNode *GetNode(Derived *parent) {
return std::addressof(parent->*Member); return std::addressof(parent->*Member);
} }
static constexpr IntrusiveRedBlackTreeNode const *GetNode(Derived const *parent) { static constexpr ALWAYS_INLINE IntrusiveRedBlackTreeNode const *GetNode(Derived const *parent) {
return std::addressof(parent->*Member); return std::addressof(parent->*Member);
} }
static constexpr Derived *GetParent(IntrusiveRedBlackTreeNode *node) { static constexpr ALWAYS_INLINE Derived *GetParent(IntrusiveRedBlackTreeNode *node) {
return util::GetParentPointer<Member, Derived>(node); return util::GetParentPointer<Member, Derived>(node);
} }
static constexpr Derived const *GetParent(IntrusiveRedBlackTreeNode const *node) { static constexpr ALWAYS_INLINE Derived const *GetParent(IntrusiveRedBlackTreeNode const *node) {
return util::GetParentPointer<Member, Derived>(node); return util::GetParentPointer<Member, Derived>(node);
} }
private: private:
@ -519,19 +519,19 @@ namespace ams::util {
friend class impl::IntrusiveRedBlackTreeImpl; friend class impl::IntrusiveRedBlackTreeImpl;
static constexpr IntrusiveRedBlackTreeNode *GetNode(Derived *parent) { static constexpr ALWAYS_INLINE IntrusiveRedBlackTreeNode *GetNode(Derived *parent) {
return std::addressof(parent->*Member); return std::addressof(parent->*Member);
} }
static constexpr IntrusiveRedBlackTreeNode const *GetNode(Derived const *parent) { static constexpr ALWAYS_INLINE IntrusiveRedBlackTreeNode const *GetNode(Derived const *parent) {
return std::addressof(parent->*Member); return std::addressof(parent->*Member);
} }
static constexpr Derived *GetParent(IntrusiveRedBlackTreeNode *node) { static constexpr ALWAYS_INLINE Derived *GetParent(IntrusiveRedBlackTreeNode *node) {
return util::GetParentPointer<Member, Derived>(node); return util::GetParentPointer<Member, Derived>(node);
} }
static constexpr Derived const *GetParent(IntrusiveRedBlackTreeNode const *node) { static constexpr ALWAYS_INLINE Derived const *GetParent(IntrusiveRedBlackTreeNode const *node) {
return util::GetParentPointer<Member, Derived>(node); return util::GetParentPointer<Member, Derived>(node);
} }
}; };
@ -558,19 +558,19 @@ namespace ams::util {
friend class impl::IntrusiveRedBlackTreeImpl; friend class impl::IntrusiveRedBlackTreeImpl;
static constexpr IntrusiveRedBlackTreeNode *GetNode(Derived *parent) { static constexpr ALWAYS_INLINE IntrusiveRedBlackTreeNode *GetNode(Derived *parent) {
return static_cast<IntrusiveRedBlackTreeNode *>(parent); return static_cast<IntrusiveRedBlackTreeNode *>(parent);
} }
static constexpr IntrusiveRedBlackTreeNode const *GetNode(Derived const *parent) { static constexpr ALWAYS_INLINE IntrusiveRedBlackTreeNode const *GetNode(Derived const *parent) {
return static_cast<const IntrusiveRedBlackTreeNode *>(parent); return static_cast<const IntrusiveRedBlackTreeNode *>(parent);
} }
static constexpr Derived *GetParent(IntrusiveRedBlackTreeNode *node) { static constexpr ALWAYS_INLINE Derived *GetParent(IntrusiveRedBlackTreeNode *node) {
return static_cast<Derived *>(node); return static_cast<Derived *>(node);
} }
static constexpr Derived const *GetParent(IntrusiveRedBlackTreeNode const *node) { static constexpr ALWAYS_INLINE Derived const *GetParent(IntrusiveRedBlackTreeNode const *node) {
return static_cast<const Derived *>(node); return static_cast<const Derived *>(node);
} }
}; };