justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[kernel] Add handle badge to ctor/assignment

Browse Source 
Handles already had a field for badge, but did not touch it in the
constructors or in assignment operators.
This commit is contained in:
Justin C. Miller
2022-02-03 00:02:46 -08:00
parent b6d4fb698c
commit 7d5feb943f
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/kernel/objects/handle.h
View File

@@ -23,35 +23,35 @@ struct handle
static_cast<j6_handle_t>(obj ? obj->get_type() : kobject::type::none) << type_shift; static_cast<j6_handle_t>(obj ? obj->get_type() : kobject::type::none) << type_shift;
} }
inline handle() : id {j6_handle_invalid}, object {nullptr} {} inline handle() : id {j6_handle_invalid}, badge {0}, object {nullptr} {}
inline handle(j6_handle_t in_id, kobject *in_obj, j6_cap_t caps) : inline handle(j6_handle_t in_id, kobject *in_obj, j6_cap_t caps, uint64_t in_badge = 0) :
id {make_id(in_id, caps, in_obj)}, object {in_obj} { id {make_id(in_id, caps, in_obj)}, badge {in_badge}, object {in_obj} {
if (object) object->handle_retain(); if (object) object->handle_retain();
} }
inline handle(const handle &other) : inline handle(const handle &o) :
id {other.id}, object {other.object} { id {o.id}, badge {o.badge}, object {o.object} {
if (object) object->handle_retain(); if (object) object->handle_retain();
} }
inline handle(handle &&other) : inline handle(handle &&o) :
id {other.id}, object {other.object} { id {o.id}, badge {o.badge}, object {o.object} {
other.id = 0; o.id = 0;
other.object = nullptr; o.object = nullptr;
} }
inline handle & operator=(const handle &other) { inline handle & operator=(const handle &o) {
if (object) object->handle_release(); if (object) object->handle_release();
id = other.id; object = other.object; id = o.id; badge = o.badge; object = o.object;
if (object) object->handle_retain(); if (object) object->handle_retain();
return *this; return *this;
} }
inline handle & operator=(handle &&other) { inline handle & operator=(handle &&o) {
if (object) object->handle_release(); if (object) object->handle_release();
id = other.id; object = other.object; id = o.id; badge = o.badge; object = o.object;
other.id = 0; other.object = nullptr; o.id = 0; o.badge = 0; o.object = nullptr;
return *this; return *this;
} }