Make Capability RefCounted

This commit is contained in:
Drew Galbraith 2023-06-07 06:21:36 -07:00
parent 6c10c57bfa
commit 55340e2917
5 changed files with 22 additions and 111 deletions

View file

@ -23,10 +23,10 @@ RefPtr<Process> Process::RootProcess() {
RefPtr<Process> Process::Create() {
auto proc = MakeRefCounted<Process>();
proc->caps_.PushBack(
new Capability(proc, Capability::PROCESS, Z_INIT_PROC_SELF,
ZC_PROC_SPAWN_PROC | ZC_PROC_SPAWN_THREAD));
proc->caps_.PushBack(new Capability(proc->vmas(), Capability::ADDRESS_SPACE,
Z_INIT_VMAS_SELF, ZC_WRITE));
MakeRefCounted<Capability>(proc, Capability::PROCESS, Z_INIT_PROC_SELF,
ZC_PROC_SPAWN_PROC | ZC_PROC_SPAWN_THREAD));
proc->caps_.PushBack(MakeRefCounted<Capability>(
proc->vmas(), Capability::ADDRESS_SPACE, Z_INIT_VMAS_SELF, ZC_WRITE));
return proc;
}
@ -62,7 +62,7 @@ void Process::CheckState() {
state_ = FINISHED;
}
SharedPtr<Capability> Process::GetCapability(uint64_t cid) {
RefPtr<Capability> Process::GetCapability(uint64_t cid) {
auto iter = caps_.begin();
while (iter != caps_.end()) {
if (iter->id() == cid) {
@ -77,30 +77,31 @@ SharedPtr<Capability> Process::GetCapability(uint64_t cid) {
uint64_t Process::AddCapability(const RefPtr<Thread>& thread) {
uint64_t cap_id = next_cap_id_++;
caps_.PushBack(new Capability(thread, Capability::THREAD, cap_id, ZC_WRITE));
caps_.PushBack(
MakeRefCounted<Capability>(thread, Capability::THREAD, cap_id, ZC_WRITE));
return cap_id;
}
uint64_t Process::AddCapability(const RefPtr<Process>& p) {
uint64_t cap_id = next_cap_id_++;
caps_.PushBack(new Capability(p, Capability::PROCESS, cap_id,
ZC_WRITE | ZC_PROC_SPAWN_THREAD));
caps_.PushBack(MakeRefCounted<Capability>(p, Capability::PROCESS, cap_id,
ZC_WRITE | ZC_PROC_SPAWN_THREAD));
return cap_id;
}
uint64_t Process::AddCapability(const RefPtr<AddressSpace>& vmas) {
uint64_t cap_id = next_cap_id_++;
caps_.PushBack(
new Capability(vmas, Capability::ADDRESS_SPACE, cap_id, ZC_WRITE));
caps_.PushBack(MakeRefCounted<Capability>(vmas, Capability::ADDRESS_SPACE,
cap_id, ZC_WRITE));
return cap_id;
}
uint64_t Process::AddCapability(const RefPtr<MemoryObject>& vmmo) {
uint64_t cap_id = next_cap_id_++;
caps_.PushBack(
new Capability(vmmo, Capability::MEMORY_OBJECT, cap_id, ZC_WRITE));
caps_.PushBack(MakeRefCounted<Capability>(vmmo, Capability::MEMORY_OBJECT,
cap_id, ZC_WRITE));
return cap_id;
}
void Process::AddCapability(uint64_t cap_id, const RefPtr<MemoryObject>& vmmo) {
caps_.PushBack(
new Capability(vmmo, Capability::MEMORY_OBJECT, cap_id, ZC_WRITE));
caps_.PushBack(MakeRefCounted<Capability>(vmmo, Capability::MEMORY_OBJECT,
cap_id, ZC_WRITE));
}