1 files changed, 31 insertions, 40 deletions

diff --git a/plugins/ObjectCacheServer/src/ObjectCacheServerEntry.cs b/plugins/ObjectCacheServer/src/ObjectCacheServerEntry.cs
index aada787..42bd0c7 100644
--- a/plugins/ObjectCacheServer/src/ObjectCacheServerEntry.cs
+++ b/plugins/ObjectCacheServer/src/ObjectCacheServerEntry.cs
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Vaughn Nugent
+* Copyright (c) 2024 Vaughn Nugent
 * 
 * Library: VNLib
 * Package: ObjectCacheServer
@@ -23,13 +23,11 @@
 */
 
 using System;
-using System.Threading;
 using System.Collections.Generic;
 
 using VNLib.Plugins;
-using VNLib.Utils.Memory;
+using VNLib.Utils;
 using VNLib.Utils.Logging;
-using VNLib.Utils.Memory.Diagnostics;
 using VNLib.Plugins.Extensions.Loading;
 using VNLib.Plugins.Extensions.Loading.Routing;
 
@@ -43,38 +41,15 @@ namespace VNLib.Data.Caching.ObjectCache.Server
     {
         public override string PluginName => "ObjectCache.Service";
 
-        private readonly Lazy<IUnmangedHeap> _cacheHeap;
-
-        internal IUnmangedHeap ListenerHeap => _cacheHeap.Value;
-
-        public ObjectCacheServerEntry()
-        {
-            //Init heap
-            _cacheHeap = new Lazy<IUnmangedHeap>(InitializeHeap, LazyThreadSafetyMode.PublicationOnly);
-        }
-
-        internal IUnmangedHeap InitializeHeap()
-        {
-            //Create default heap
-            IUnmangedHeap _heap = MemoryUtil.InitializeNewHeapForProcess();
-            try
-            {
-                //If the plugin is in debug mode enable heap tracking
-                return this.IsDebug() ? new TrackedHeapWrapper(_heap, true) : _heap;
-            }
-            catch
-            {
-                _heap.Dispose();
-                throw;
-            }
-        }
+        ObjectCacheSystemState? sysState;
 
         protected override void OnLoad()
         {
             try
             {
-                //Get the node configuration first
-                NodeConfig config = this.GetOrCreateSingleton<NodeConfig>();
+                //Initialize the cache node builder
+                sysState = this.GetOrCreateSingleton<ObjectCacheSystemState>();
+                sysState.Initialize();
 
                 //Route well-known endpoint
                 this.Route<WellKnownEndpoint>();
@@ -85,8 +60,8 @@ namespace VNLib.Data.Caching.ObjectCache.Server
                 //We must initialize the replication manager
                 _ = this.GetOrCreateSingleton<CacheNodeReplicationMaanger>();
 
-                //Setup discovery endpoint
-                if(!string.IsNullOrWhiteSpace(config.DiscoveryPath))
+                //Setup discovery endpoint only if the user enabled clustering
+                if(!string.IsNullOrWhiteSpace(sysState.ClusterConfig.DiscoveryPath))
                 {
                     this.Route<PeerDiscoveryEndpoint>();
                 }               
@@ -101,18 +76,34 @@ namespace VNLib.Data.Caching.ObjectCache.Server
 
         protected override void OnUnLoad()
         {
-            //dispose heap if initialized
-            if(_cacheHeap.IsValueCreated)
-            {
-                _cacheHeap.Value.Dispose();
-            }
-
             Log.Information("Plugin unloaded");
         }
 
         protected override void ProcessHostCommand(string cmd)
         {
-            throw new NotImplementedException();
+            if(string.IsNullOrWhiteSpace(cmd))
+            {
+                return;
+            }
+
+            ArgumentList al = new(cmd.Split(" "));
+
+            if(al.Count == 0)
+            {
+                Log.Warn("Invalid command");
+                return;
+            }
+
+            switch (al[0].ToLower(null))
+            {
+                case "memstats":
+                    sysState?.LogMemoryStats();
+                    break;
+
+                default:
+                    Log.Warn("Invalid command");
+                    break;
+            }
         }
     }
 }