fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Kernel] Improvements to host and guest objects handling

Browse Source
This commit is contained in:
Gliniak
2023-01-05 22:51:18 +01:00
committed by Radosław Gliński
parent 5b0fe5aada
commit 40f6b5b3ac
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/xenia/kernel/util/object_table.cc
View File

@@ -132,7 +132,13 @@ X_STATUS ObjectTable::AddHandle(XObject* object, X_HANDLE* out_handle) {
entry.object = object;
entry.handle_ref_count = 1;
handle = slot << 2;
if (!host_object) handle += XObject::kHandleBase;
if (!host_object) {
if (object->type() != XObject::Type::Socket) {
handle += XObject::kHandleBase;
}
} else {
handle += XObject::kHandleHostBase;
}
object->handles().push_back(handle);
// Retain so long as the object is in the table.
@@ -286,10 +292,9 @@ ObjectTable::ObjectTableEntry* ObjectTable::LookupTableInLock(X_HANDLE handle) {
return nullptr;
}
// Lower 2 bits are ignored.
bool host = (handle < XObject::kHandleBase);
uint32_t slot = GetHandleSlot(handle, host);
if (host) {
const bool is_host_object = XObject::is_handle_host_object(handle);
uint32_t slot = GetHandleSlot(handle, is_host_object);
if (is_host_object) {
if (slot <= host_table_capacity_) {
return &host_table_[slot];
}
@@ -320,12 +325,11 @@ XObject* ObjectTable::LookupObject(X_HANDLE handle, bool already_locked) {
global_critical_region_.mutex().lock();
}
// Lower 2 bits are ignored.
bool host = (handle < XObject::kHandleBase);
uint32_t slot = GetHandleSlot(handle, host);
const bool is_host_object = XObject::is_handle_host_object(handle);
uint32_t slot = GetHandleSlot(handle, is_host_object);
// Verify slot.
if (host) {
if (is_host_object) {
if (slot < host_table_capacity_) {
ObjectTableEntry& entry = host_table_[slot];
if (entry.object) {
@@ -461,13 +465,13 @@ bool ObjectTable::Restore(ByteStream* stream) {
}
X_STATUS ObjectTable::RestoreHandle(X_HANDLE handle, XObject* object) {
bool host = (handle < XObject::kHandleBase);
uint32_t slot = GetHandleSlot(handle, host);
uint32_t capacity = host ? host_table_capacity_ : table_capacity_;
const bool is_host_object = XObject::is_handle_host_object(handle);
uint32_t slot = GetHandleSlot(handle, is_host_object);
uint32_t capacity = is_host_object ? host_table_capacity_ : table_capacity_;
assert_true(capacity >= slot);
if (capacity >= slot) {
auto& entry = host ? host_table_[slot] : table_[slot];
auto& entry = is_host_object ? host_table_[slot] : table_[slot];
entry.object = object;
object->Retain();
}