refactor system into a class

Author: popcron

source/Systems/DataImportSystem.cs

@@ -2,16 +2,14 @@
 using Data.Components;
 using Data.Messages;
 using Simulation;
-using Simulation.Functions;
 using System;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 using Unmanaged;
 using Worlds;
 
 namespace Data.Systems
 {
-    public readonly partial struct DataImportSystem : ISystem
+    public partial class DataImportSystem : ISystem, IDisposable, IListener<LoadData>
     {
         private readonly Dictionary<Entity, LoadingTask> tasks;
         private readonly Stack<Operation> operations;
@@ -22,7 +20,7 @@ public DataImportSystem()
             operations = new(4);
         }
 
-        public readonly void Dispose()
+        public void Dispose()
         {
             while (operations.TryPop(out Operation operation))
             {
@@ -33,17 +31,9 @@ public readonly void Dispose()
             tasks.Dispose();
         }
 
-        unsafe readonly void ISystem.CollectMessageHandlers(MessageHandlerCollector collectors)
-        {
-            collectors.Add<LoadData>(&HandleDataRequest);
-        }
-
-        void ISystem.Start(in SystemContext context, in World world)
-        {
-        }
-
-        void ISystem.Update(in SystemContext context, in World world, in TimeSpan delta)
+        void ISystem.Update(Simulator simulator, double deltaTime)
         {
+            World world = simulator.world;
             Schema schema = world.Schema;
             int dataComponent = schema.GetComponentType<IsDataRequest>();
             int sourceType = schema.GetComponentType<IsDataSource>();
@@ -79,7 +69,7 @@ void ISystem.Update(in SystemContext context, in World world, in TimeSpan delta)
                             }
                             else
                             {
-                                task.duration += delta;
+                                task.duration += deltaTime;
                                 if (task.duration >= request.timeout)
                                 {
                                     request.status = RequestStatus.NotFound;
@@ -98,11 +88,28 @@ void ISystem.Update(in SystemContext context, in World world, in TimeSpan delta)
             PerformInstructions(world);
         }
 
-        void ISystem.Finish(in SystemContext context, in World world)
+        void IListener<LoadData>.Receive(ref LoadData request)
         {
+            if (request.status == RequestStatus.Uninitialized)
+            {
+                request.status = RequestStatus.Loading;
+            }
+
+            if (request.status == RequestStatus.Loading)
+            {
+                int sourceType = request.world.Schema.GetComponentType<IsDataSource>();
+                if (TryLoad(request.world, request.address, sourceType, out ByteReader newReader))
+                {
+                    request.Load(newReader);
+                }
+                else
+                {
+                    request.NotFound();
+                }
+            }
         }
 
-        private readonly void PerformInstructions(World world)
+        private void PerformInstructions(World world)
         {
             while (operations.TryPop(out Operation operation))
             {
@@ -119,7 +126,7 @@ private static bool TryLoad(Entity entity, Address address, int sourceType, out
                 Span<byte> readData = newReader.GetBytes();
                 operation = new();
                 operation.SelectEntity(entity);
-                operation.CreateOrSetArray(readData.As<byte, BinaryData>());
+                operation.CreateOrSetArray(readData.As<byte, DataByte>());
                 newReader.Dispose();
                 return true;
             }
@@ -167,7 +174,7 @@ private static bool TryLoadFromWorld(World world, Address address, int sourceTyp
                         if (source.address.Matches(address))
                         {
                             uint entity = entities[i];
-                            Span<byte> fileData = world.GetArray<BinaryData>(entity).AsSpan<byte>();
+                            Span<byte> fileData = world.GetArray<DataByte>(entity).AsSpan<byte>();
                             newReader = new(fileData);
                             Trace.WriteLine($"Loaded data from entity `{entity}` for address `{source.address}`");
                             return true;
@@ -196,27 +203,5 @@ private static bool TryLoadFromFileSystem(Address address, out ByteReader newRea
                 return false;
             }
         }
-
-        [UnmanagedCallersOnly]
-        private static StatusCode HandleDataRequest(HandleMessage.Input input)
-        {
-            ref LoadData message = ref input.ReadMessage<LoadData>();
-            if (!message.IsLoaded)
-            {
-                int sourceType = message.world.Schema.GetComponentType<IsDataSource>();
-                if (TryLoad(message.world, message.address, sourceType, out ByteReader newReader))
-                {
-                    message.BecomeLoaded(newReader);
-                    return StatusCode.Success(0);
-                }
-                else
-                {
-                    Trace.TraceError($"Failed to load data from address `{message.address}`, data not found");
-                    return StatusCode.Failure(0);
-                }
-            }
-
-            return StatusCode.Continue;
-        }
     }
 }

source/Systems/LoadingTask.cs

@@ -5,7 +5,7 @@ namespace Data.Systems
     internal struct LoadingTask
     {
         public readonly DateTime startTime;
-        public TimeSpan duration;
+        public double duration;
 
         [Obsolete("Default constructor not supported", true)]
         public LoadingTask()

tests/DataSystemTests.cs

@@ -14,7 +14,13 @@ static DataSystemTests()
         protected override void SetUp()
         {
             base.SetUp();
-            simulator.AddSystem(new DataImportSystem());
+            simulator.Add(new DataImportSystem());
+        }
+
+        protected override void TearDown()
+        {
+            simulator.Remove<DataImportSystem>();
+            base.TearDown();
         }
 
         protected override Schema CreateSchema()

tests/ImportTests.cs

@@ -1,5 +1,5 @@
 using Collections.Generic;
-using Data.Components;
+using Data.Messages;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -129,5 +129,26 @@ public async Task LoadEmbeddedResource(CancellationToken cancellation)
             Span<char> fileText = span.Slice(0, length);
             Assert.That(fileText.ToString(), Contains.Substring("i am an embedded resource"));
         }
+
+        [Test]
+        public void LoadWithMessage()
+        {
+            const string FileName = "tomato";
+            string randomStr = Guid.NewGuid().ToString();
+            DataSource file = new(world, FileName);
+            file.WriteUTF8(randomStr);
+
+            LoadData loadData = new(world, FileName);
+            Broadcast(ref loadData);
+            Assert.That(loadData.status == RequestStatus.Loaded);
+            bool consumed = loadData.TryConsume(out ByteReader byteReader);
+            Assert.That(consumed, Is.True);
+            Assert.That(loadData.status == RequestStatus.Consumed);
+            Span<char> buffer = stackalloc char[128];
+            int length = byteReader.ReadUTF8(buffer);
+            Span<char> text = buffer.Slice(0, length);
+            Assert.That(text.ToString(), Is.EqualTo(randomStr));
+            byteReader.Dispose();
+        }
     }
 }