Break the spawnd kill API into kill + cleanup.

[barrelfish] / usr / spawnd / ps.c

diff --git a/usr/spawnd/ps.c b/usr/spawnd/ps.c
index f1e0d1a..46e66a3 100644 (file)
--- a/usr/spawnd/ps.c
+++ b/usr/spawnd/ps.c
@@ -12,10 +12,14 @@
 #include <string.h>
 #include <assert.h>
 #include <barrelfish/barrelfish.h>
+#include <collections/hash_table.h>
 #include <vfs/vfs.h>
 
 #include "ps.h"
 
+#define HASH_INDEX_BUCKETS 6151
+static collections_hash_table* ps_table = NULL;
+
 static struct ps_entry *entries[MAX_DOMAINS];
 
 errval_t ps_allocate(struct ps_entry *entry, domainid_t *domainid)
@@ -24,6 +28,7 @@ errval_t ps_allocate(struct ps_entry *entry, domainid_t *domainid)
         if(entries[i] == NULL) {
             entries[i] = entry;
             *domainid = i;
+            entry->domain_id = i;
             return SYS_ERR_OK;
         }
     }
@@ -51,3 +56,66 @@ struct ps_entry *ps_get(domainid_t domain_id)
 
     return entries[domain_id];
 }
+
+errval_t ps_hash_domain(struct ps_entry *entry, struct capref domain_cap)
+{
+    entry->domain_cap = domain_cap;
+
+    if (ps_table == NULL) {
+        collections_hash_create_with_buckets(&ps_table, HASH_INDEX_BUCKETS,
+                                             NULL);
+        if (ps_table == NULL) {
+            return SPAWN_ERR_CREATE_DOMAIN_TABLE;
+        }
+    }
+
+    uint64_t key;
+    errval_t err = domain_cap_hash(entry->domain_cap, &key);
+    if (err_is_fail(err)) {
+        return err;
+    }
+
+    collections_hash_insert(ps_table, key, entry);
+
+    return SYS_ERR_OK;
+}
+
+errval_t ps_get_domain(struct capref domain_cap, struct ps_entry **ret_entry,
+                       uint64_t *ret_hash_key)
+{
+    assert(ret_entry != NULL);
+
+    uint64_t key;
+    errval_t err = domain_cap_hash(domain_cap, &key);
+    if (err_is_fail(err)) {
+        return err;
+    }
+
+    void *table_entry = collections_hash_find(ps_table, key);
+    if (table_entry == NULL) {
+        return SPAWN_ERR_DOMAIN_TABLE_FIND;
+    }
+    *ret_entry = (struct ps_entry*) table_entry;
+
+    if (ret_hash_key != NULL) {
+        *ret_hash_key = key;
+    }
+
+    return SYS_ERR_OK;
+}
+
+errval_t ps_release_domain(struct capref domain_cap,
+                           struct ps_entry **ret_entry)
+{
+    assert(ret_entry != NULL);
+
+    uint64_t key;
+    errval_t err = ps_get_domain(domain_cap, ret_entry, &key);
+    if (err_is_fail(err)) {
+        return err;
+    }
+
+    collections_hash_delete(ps_table, key);
+
+    return SYS_ERR_OK;
+}