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

Mass rename memory object variables.

Browse source 
Use shorthand:
AddressSpace -> vmas
MemoryObject -> vmmo

The VM prefix makes these a little more distinguishable in code.
This commit is contained in:
Drew Galbraith 2023-06-07 00:30:26 -07:00
parent a8a4f8d9ab
commit 6c10c57bfa
8 changed files with 53 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

16
zion/object/process.cpp
View file

@ -26,12 +26,12 @@ RefPtr<Process> Process::Create() {
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_AS_SELF, ZC_WRITE));
Z_INIT_VMAS_SELF, ZC_WRITE));
return proc;
}
Process::Process()
: id_(gNextId++), vmm_(MakeRefCounted<AddressSpace>()), state_(RUNNING) {}
: id_(gNextId++), vmas_(MakeRefCounted<AddressSpace>()), state_(RUNNING) {}
RefPtr<Thread> Process::CreateThread() {
RefPtr<Thread> thread = MakeRefCounted<Thread>(*this, next_thread_id_++);
@ -87,20 +87,20 @@ uint64_t Process::AddCapability(const RefPtr<Process>& p) {
ZC_WRITE | ZC_PROC_SPAWN_THREAD));
return cap_id;
}
uint64_t Process::AddCapability(const RefPtr<AddressSpace>& as) {
uint64_t Process::AddCapability(const RefPtr<AddressSpace>& vmas) {
uint64_t cap_id = next_cap_id_++;
caps_.PushBack(
new Capability(as, Capability::ADDRESS_SPACE, cap_id, ZC_WRITE));
new Capability(vmas, Capability::ADDRESS_SPACE, cap_id, ZC_WRITE));
return cap_id;
}
uint64_t Process::AddCapability(const RefPtr<MemoryObject>& mo) {
uint64_t Process::AddCapability(const RefPtr<MemoryObject>& vmmo) {
uint64_t cap_id = next_cap_id_++;
caps_.PushBack(
new Capability(mo, Capability::MEMORY_OBJECT, cap_id, ZC_WRITE));
new Capability(vmmo, Capability::MEMORY_OBJECT, cap_id, ZC_WRITE));
return cap_id;
}
void Process::AddCapability(uint64_t cap_id, const RefPtr<MemoryObject>& mo) {
void Process::AddCapability(uint64_t cap_id, const RefPtr<MemoryObject>& vmmo) {
caps_.PushBack(
new Capability(mo, Capability::MEMORY_OBJECT, cap_id, ZC_WRITE));
new Capability(vmmo, Capability::MEMORY_OBJECT, cap_id, ZC_WRITE));
}

12
zion/object/process.h
View file

@ -23,7 +23,7 @@ class Process : public KernelObject {
static RefPtr<Process> Create();
uint64_t id() const { return id_; }
RefPtr<AddressSpace> vmas() { return vmm_; }
RefPtr<AddressSpace> vmas() { return vmas_; }
RefPtr<Thread> CreateThread();
RefPtr<Thread> GetThread(uint64_t tid);
@ -31,10 +31,10 @@ class Process : public KernelObject {
SharedPtr<Capability> GetCapability(uint64_t cid);
uint64_t AddCapability(const RefPtr<Thread>& t);
uint64_t AddCapability(const RefPtr<Process>& p);
uint64_t AddCapability(const RefPtr<AddressSpace>& as);
uint64_t AddCapability(const RefPtr<MemoryObject>& mo);
uint64_t AddCapability(const RefPtr<AddressSpace>& vmas);
uint64_t AddCapability(const RefPtr<MemoryObject>& vmmo);
void AddCapability(uint64_t cap_id, const RefPtr<MemoryObject>& mo);
void AddCapability(uint64_t cap_id, const RefPtr<MemoryObject>& vmmo);
// Checks the state of all child threads and transitions to
// finished if all have finished.
void CheckState();
@ -44,9 +44,9 @@ class Process : public KernelObject {
private:
friend class MakeRefCountedFriend<Process>;
Process();
Process(uint64_t id) : id_(id), vmm_(AddressSpace::ForRoot()) {}
Process(uint64_t id) : id_(id), vmas_(AddressSpace::ForRoot()) {}
uint64_t id_;
RefPtr<AddressSpace> vmm_;
RefPtr<AddressSpace> vmas_;
State state_;
uint64_t next_thread_id_ = 0;