drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[zion] Store capability ids on the CapabilityTable. 

This is preferable to storing it in the capability itself since the id
is really just an index for the containing process.
This commit is contained in:
Drew Galbraith 2023-06-16 15:27:09 -07:00
parent b27672d5de
commit 75b1f2d21c
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zion/capability/capability.h
View File

@ -10,19 +10,16 @@ class Thread;
class Capability : public RefCounted<Capability> {
public:
Capability(const RefPtr<KernelObject>& obj, uint64_t id, uint64_t permissions)
: obj_(obj), id_(id), permissions_(permissions) {}
Capability(const RefPtr<KernelObject>& obj, uint64_t permissions)
: obj_(obj), permissions_(permissions) {}
template <typename T>
Capability(const RefPtr<T>& obj, uint64_t id, uint64_t permissions)
: Capability(StaticCastRefPtr<KernelObject>(obj), id, permissions) {}
Capability(const RefPtr<T>& obj, uint64_t permissions)
: Capability(StaticCastRefPtr<KernelObject>(obj), permissions) {}
template <typename T>
RefPtr<T> obj();
uint64_t id() { return id_; }
void set_id(uint64_t id) { id_ = id; }
uint64_t permissions() { return permissions_; }
bool HasPermissions(uint64_t requested) {
return (permissions_ & requested) == requested;
@ -30,7 +27,6 @@ class Capability : public RefCounted<Capability> {
private:
RefPtr<KernelObject> obj_;
uint64_t id_;
uint64_t permissions_;
};

16
zion/capability/capability_table.cpp
View File

@ -4,17 +4,17 @@ CapabilityTable::CapabilityTable() {}
uint64_t CapabilityTable::AddExistingCapability(const RefPtr<Capability>& cap) {
MutexHolder h(lock_);
cap->set_id(next_cap_id_++);
capabilities_.PushBack(cap);
return cap->id();
uint64_t id = next_cap_id_++;
capabilities_.PushBack({.id = id, .cap = cap});
return id;
}
RefPtr<Capability> CapabilityTable::GetCapability(uint64_t id) {
MutexHolder h(lock_);
auto iter = capabilities_.begin();
while (iter != capabilities_.end()) {
if (*iter && (*iter)->id() == id) {
return *iter;
if (iter->cap && iter->id == id) {
return iter->cap;
}
++iter;
}
@ -27,10 +27,10 @@ RefPtr<Capability> CapabilityTable::ReleaseCapability(uint64_t id) {
MutexHolder h(lock_);
auto iter = capabilities_.begin();
while (iter != capabilities_.end()) {
if (*iter && (*iter)->id() == id) {
if (iter->cap && iter->id == id) {
// FIXME: Do an actual release here.
auto cap = *iter;
*iter = {nullptr};
auto cap = iter->cap;
iter->cap = {nullptr};
return cap;
}
++iter;

12
zion/capability/capability_table.h
View File

@ -29,7 +29,11 @@ class CapabilityTable {
// FIXME: store this id here rather than in the capability.
uint64_t next_cap_id_ = 0x100;
// FIXME: use a map data structure.
LinkedList<RefPtr<Capability>> capabilities_;
struct CapEntry {
uint64_t id;
RefPtr<Capability> cap;
};
LinkedList<CapEntry> capabilities_;
};
template <typename T>
@ -37,7 +41,8 @@ uint64_t CapabilityTable::AddNewCapability(const RefPtr<T>& object,
uint64_t permissions) {
MutexHolder h(lock_);
uint64_t id = next_cap_id_++;
capabilities_.PushBack(MakeRefCounted<Capability>(object, id, permissions));
capabilities_.PushBack(
{.id = id, .cap = MakeRefCounted<Capability>(object, permissions)});
return id;
}
@ -45,5 +50,6 @@ template <typename T>
void CapabilityTable::AddNewCapabilityWithId(uint64_t id,
const RefPtr<T>& object,
uint64_t permissions) {
capabilities_.PushBack(MakeRefCounted<Capability>(object, id, permissions));
capabilities_.PushBack(
{.id = id, .cap = MakeRefCounted<Capability>(object, permissions)});
}