drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

[Zion/Glacier] Add a HashMap to store process capabilities.

Browse source
This commit is contained in:
Drew Galbraith 2023-11-16 22:12:00 -08:00
parent 6756d25e5c
commit 6e227e1cf6
5 changed files with 271 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

33
zion/capability/capability_table.cpp
View file

@ -8,37 +8,26 @@ uint64_t CapabilityTable::AddExistingCapability(
const glcr::RefPtr<Capability>& cap) {
MutexHolder h(lock_);
uint64_t id = next_cap_id_++;
capabilities_.PushBack({.id = id, .cap = cap});
if (capabilities_.Insert(id, cap) != glcr::OK) {
panic("Reusing capability id.");
}
return id;
}
glcr::RefPtr<Capability> CapabilityTable::GetCapability(uint64_t id) {
MutexHolder h(lock_);
auto iter = capabilities_.begin();
while (iter != capabilities_.end()) {
if (iter->cap && iter->id == id) {
return iter->cap;
}
++iter;
if (!capabilities_.Contains(id)) {
panic("Bad cap access {}", id);
}
dbgln("Bad cap access {}", id);
dbgln("Num caps: {}", capabilities_.size());
return {};
return capabilities_.at(id);
}
glcr::RefPtr<Capability> CapabilityTable::ReleaseCapability(uint64_t id) {
MutexHolder h(lock_);
auto iter = capabilities_.begin();
while (iter != capabilities_.end()) {
if (iter->cap && iter->id == id) {
// FIXME: Do an actual release here.
auto cap = iter->cap;
iter->cap = {nullptr};
return cap;
}
++iter;
if (!capabilities_.Contains(id)) {
panic("Bad cap release {}", id);
}
dbgln("Bad cap release: {}", id);
dbgln("Num caps: {}", capabilities_.size());
return {};
auto cap = capabilities_.at(id);
(void)capabilities_.Delete(id);
return cap;
}

17
zion/capability/capability_table.h
View file

@ -1,9 +1,10 @@
#pragma once
#include <glacier/container/linked_list.h>
#include <glacier/container/hash_map.h>
#include <glacier/memory/ref_ptr.h>
#include "capability/capability.h"
#include "debug/debug.h"
#include "object/mutex.h"
class CapabilityTable {
@ -28,12 +29,8 @@ class CapabilityTable {
glcr::RefPtr<Mutex> lock_ = Mutex::Create();
// TODO: Do some randomization.
uint64_t next_cap_id_ = 0x100;
// FIXME: use a map data structure.
struct CapEntry {
uint64_t id;
glcr::RefPtr<Capability> cap;
};
glcr::LinkedList<CapEntry> capabilities_;
// TODO: Consider not holding a uniqueptr here instead of a refptr?
glcr::HashMap<uint64_t, glcr::RefPtr<Capability>> capabilities_;
};
template <typename T>
@ -41,7 +38,9 @@ uint64_t CapabilityTable::AddNewCapability(const glcr::RefPtr<T>& object,
uint64_t permissions) {
MutexHolder h(lock_);
uint64_t id = next_cap_id_++;
capabilities_.PushBack(
{.id = id, .cap = MakeRefCounted<Capability>(object, permissions)});
if (capabilities_.Insert(
id, MakeRefCounted<Capability>(object, permissions)) != glcr::OK) {
panic("Reusing capability id {}", id);
}
return id;
}