merge lifecycle-ergonomics and rework modes and contain checks

2 files changed, 8 insertions, 3 deletions

diff --git a/lib/kernel/Namespace.ml b/lib/kernel/Namespace.ml
index 340e813..c7c0767 100644
--- a/lib/kernel/Namespace.ml
+++ b/lib/kernel/Namespace.ml
@@ -1,18 +1,22 @@
 class namespace =
   object (self)
-    inherit Lifecycle.null
+    inherit Lifecycle.counted
     inherit Identity.of_id
     method to_string = "namespace"
     val entries : (string, Protocols.Handle.t) BatMap.t Atomic.t = Atomic.make BatMap.empty
     method protocols = Protocols.[Directory.make self; Registry.make self]
+    method destroy = Atomic.get entries |> BatMap.values |> BatEnum.iter Protocols.Handle.release
 
     method update key reference value =
       match
         Utilities.Atomic.mswap entries (fun e ->
-            if BatMap.find_opt key e = reference then
+            let existing = BatMap.find_opt key e in
+            if existing = reference then begin
+              Option.map Protocols.Handle.release existing |> ignore;
               match value with
-              | Some v -> Ok (BatMap.add key v e)
+              | Some v -> Ok (BatMap.add key (Protocols.Handle.move v) e)
               | None -> Ok (BatMap.remove key e)
+            end
             else Error () )
       with
       | Ok _ -> Ok true
diff --git a/lib/kernel/Namespace.mli b/lib/kernel/Namespace.mli
index ec77724..394e44a 100644
--- a/lib/kernel/Namespace.mli
+++ b/lib/kernel/Namespace.mli
@@ -2,6 +2,7 @@ class namespace : object
   inherit Protocols.Handle.obj
   inherit Protocols.Directory.implementation
   inherit Protocols.Registry.implementation
+  method destroy : unit
 end
 
 val make : unit -> Protocols.Handle.t