Make a KernelObject base class for all Capabilities.

zion/capability/capability.cpp

@@ -1,11 +1,14 @@
 #include "capability/capability.h"
 
+#include "scheduler/process.h"
+#include "scheduler/thread.h"
+
 template <>
 Process& Capability::obj<Process>() {
   if (type_ != PROCESS) {
     panic("Accessing %u cap as object.", type_);
   }
-  return *static_cast<Process*>(obj_);
+  return *static_cast<Process*>(obj_.get());
 }
 
 template <>
@@ -13,5 +16,5 @@ Thread& Capability::obj<Thread>() {
   if (type_ != THREAD) {
     panic("Accessing %u cap as object.", type_);
   }
-  return *static_cast<Thread*>(obj_);
+  return *static_cast<Thread*>(obj_.get());
 }

zion/capability/capability.h

@@ -2,7 +2,8 @@
 
 #include <stdint.h>
 
-#include "debug/debug.h"
+#include "lib/ref_ptr.h"
+#include "object/kernel_object.h"
 
 class Process;
 class Thread;
@@ -14,9 +15,15 @@ class Capability {
     PROCESS,
     THREAD,
   };
-  Capability(void* obj, Type type, uint64_t id, uint64_t permissions)
+  Capability(const RefPtr<KernelObject>& obj, Type type, uint64_t id,
+             uint64_t permissions)
       : obj_(obj), type_(type), id_(id), permissions_(permissions) {}
 
+  template <typename T>
+  Capability(const RefPtr<T>& obj, Type type, uint64_t id, uint64_t permissions)
+      : Capability(StaticCastRefPtr<KernelObject>(obj), type, id, permissions) {
+  }
+
   template <typename T>
   T& obj();
 
@@ -30,8 +37,7 @@ class Capability {
   }
 
  private:
-  // FIXME: This should somehow be a shared ptr to keep the object alive.
+  RefPtr<KernelObject> obj_;
-  void* obj_;
   Type type_;
   uint64_t id_;
   uint64_t permissions_;

zion/lib/ref_ptr.h

@@ -6,6 +6,9 @@ class RefPtr;
 template <typename T>
 RefPtr<T> AdoptPtr(T* ptr);
 
+template <typename T, typename U>
+RefPtr<T> StaticCastRefPtr(const RefPtr<U>& ref);
+
 template <typename T>
 class RefPtr {
  public:
@@ -38,6 +41,11 @@ class RefPtr {
     return *this;
   }
 
+  enum DontAdoptTag {
+    DontAdopt,
+  };
+  RefPtr(T* ptr, DontAdoptTag) : ptr_(ptr) { ptr->Acquire(); }
+
   T* get() const { return ptr_; };
   T& operator*() const { return *ptr_; }
   T* operator->() const { return ptr_; }
@@ -74,3 +82,8 @@ template <typename T>
 RefPtr<T> AdoptPtr(T* ptr) {
   return RefPtr(ptr);
 }
+
+template <typename T, typename U>
+RefPtr<T> StaticCastRefPtr(const RefPtr<U>& ref) {
+  return RefPtr(static_cast<T*>(ref.get()), RefPtr<T>::DontAdopt);
+}

zion/loader/init_loader.cpp

@@ -50,7 +50,7 @@ void LoadInitProgram() {
   const limine_file& init_prog = GetInitProgram("/sys/test");
   const limine_file& prog2 = GetInitProgram("/sys/test2");
 
-  RefPtr<Process> proc = MakeRefCounted<Process>();
+  RefPtr<Process> proc = Process::Create();
   gProcMan->InsertProcess(proc);
 
   uint64_t entry = LoadElfProgram(

zion/object/kernel_object.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "lib/ref_counted.h"
+
+class KernelObject : public RefCounted<KernelObject> {};

zion/scheduler/process.cpp

@@ -20,13 +20,16 @@ RefPtr<Process> Process::RootProcess() {
 
   return proc;
 }
-RefPtr<Process> Process::Create() { return MakeRefCounted<Process>(); }
+RefPtr<Process> Process::Create() {
-
+  auto proc = MakeRefCounted<Process>();
-Process::Process() : id_(gNextId++), state_(RUNNING) {
+  proc->caps_.PushBack(
-  caps_.PushBack(new Capability(this, Capability::PROCESS, Z_INIT_PROC_SELF,
+      new Capability(proc, Capability::PROCESS, Z_INIT_PROC_SELF,
-                                ZC_PROC_SPAWN_PROC | ZC_PROC_SPAWN_THREAD));
+                     ZC_PROC_SPAWN_PROC | ZC_PROC_SPAWN_THREAD));
+  return proc;
 }
 
+Process::Process() : id_(gNextId++), state_(RUNNING) {}
+
 RefPtr<Thread> Process::CreateThread() {
   RefPtr<Thread> thread = MakeRefCounted<Thread>(*this, next_thread_id_++);
   threads_.PushBack(thread);
@@ -65,12 +68,12 @@ SharedPtr<Capability> Process::GetCapability(uint64_t cid) {
     ++iter;
   }
   dbgln("Bad cap access");
+  dbgln("Num caps: %u", caps_.size());
   return {};
 }
 
-uint64_t Process::AddCapability(RefPtr<Thread>& thread) {
+uint64_t Process::AddCapability(const RefPtr<Thread>& thread) {
   uint64_t cap_id = next_cap_id_++;
-  caps_.PushBack(
+  caps_.PushBack(new Capability(thread, Capability::THREAD, cap_id, ZC_WRITE));
-      new Capability(thread.get(), Capability::THREAD, cap_id, ZC_WRITE));
   return cap_id;
 }

zion/scheduler/process.h

@@ -4,7 +4,6 @@
 
 #include "capability/capability.h"
 #include "lib/linked_list.h"
-#include "lib/ref_counted.h"
 #include "lib/ref_ptr.h"
 #include "lib/shared_ptr.h"
 #include "memory/virtual_memory.h"
@@ -12,7 +11,7 @@
 // Forward decl due to cyclic dependency.
 class Thread;
 
-class Process : public RefCounted<Process> {
+class Process : public KernelObject {
  public:
   enum State {
     UNSPECIFIED,
@@ -30,7 +29,7 @@ class Process : public RefCounted<Process> {
   RefPtr<Thread> GetThread(uint64_t tid);
 
   SharedPtr<Capability> GetCapability(uint64_t cid);
-  uint64_t AddCapability(RefPtr<Thread>& t);
+  uint64_t AddCapability(const RefPtr<Thread>& t);
   // Checks the state of all child threads and transitions to
   // finished if all have finished.
   void CheckState();

zion/scheduler/thread.h

@@ -2,13 +2,13 @@
 
 #include <stdint.h>
 
-#include "lib/ref_counted.h"
 #include "lib/ref_ptr.h"
+#include "object/kernel_object.h"
 
 // Forward decl due to cyclic dependency.
 class Process;
 
-class Thread : public RefCounted<Thread> {
+class Thread : public KernelObject {
  public:
   enum State {
     UNSPECIFIED,

zion/syscall/syscall.cpp

@@ -71,7 +71,7 @@ uint64_t ProcessSpawnElf(ZProcessSpawnElfReq* req) {
     return ZE_DENIED;
   }
   dbgln("Proc spawn: %u:%u", req->elf_base, req->elf_size);
-  RefPtr<Process> proc = MakeRefCounted<Process>();
+  RefPtr<Process> proc = Process::Create();
   gProcMan->InsertProcess(proc);
   uint64_t entry = LoadElfProgram(*proc, req->elf_base, req->elf_size);
   proc->CreateThread()->Start(entry, 0, 0);