Merge pull request #50 from the9ball/feat/commandmode

feat: Add CommandMode to Context
Cysharp · Apr 12, 2024 · bc68d6f · bc68d6f
2 parents 34dbd43 + f2163e6
commit bc68d6f
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -380,6 +380,7 @@ It can check on `...` drawer on each worker result.
 ```csharp
 public class WorkloadContext
 {
+    public CommandMode CommandMode { get; }
     public ExecutionId ExecutionId { get; }
     public WorkloadId WorkloadId { get; }
     public int WorkloadCount { get; }

diff --git a/src/DFrame.Controller/Controller/DFrameControllerExecutionEngine.cs b/src/DFrame.Controller/Controller/DFrameControllerExecutionEngine.cs
@@ -43,7 +43,7 @@ public DFrameControllerExecutionEngine(ILoggerFactory loggerFactory, IExecutionR
         this.eventMessagePublisher = eventMessagePublisher;
     }
 
-    public bool StartWorkerFlow(string workloadName, int concurrency, long totalRequestCount, int workerLimit, KeyValuePair<string, string?>[] parameters)
+    public bool StartWorkerFlow(CommandMode commandMode, string workloadName, int concurrency, long totalRequestCount, int workerLimit, KeyValuePair<string, string?>[] parameters)
     {
         lock (EngineSync)
         {
@@ -136,10 +136,10 @@ public bool StartWorkerFlow(string workloadName, int concurrency, long totalRequ
                 broadcaster = globalGroup.CreateBroadcasterTo<IWorkerReceiver>(connectionIds);
             }
 
-            broadcaster.CreateWorkloadAndSetup(executionId, createWorkloadCount, concurrency, totalRequestCount, workloadName, parameters!);
+            broadcaster.CreateWorkloadAndSetup(commandMode, executionId, createWorkloadCount, concurrency, totalRequestCount, workloadName, parameters!);
             StateChanged?.Invoke();
-        }
-
+        }
+
         eventMessagePublisher.Publish(new(EventMessage.ControllerEventMessageType.WorkflowStarted, LatestExecutionSummary));
 
         return true;

diff --git a/src/DFrame.Controller/HubDefinitions.cs b/src/DFrame.Controller/HubDefinitions.cs
@@ -45,7 +45,7 @@ public interface IControllerHub : IStreamingHub<IControllerHub, IWorkerReceiver>
 
     public interface IWorkerReceiver
     {
-        void CreateWorkloadAndSetup(ExecutionId executionId, int createCount, int concurrency, long totalRequestCount, string workloadName, KeyValuePair<string, string>[] parameters);
+        void CreateWorkloadAndSetup(CommandMode commandMode, ExecutionId executionId, int createCount, int concurrency, long totalRequestCount, string workloadName, KeyValuePair<string, string>[] parameters);
         void Execute(long[] executeCount); // exec count per workload
         void Stop();
         void Teardown();
@@ -268,4 +268,12 @@ public enum AllowParameterType
         DateTime,
         String,
     }
+
+    public enum CommandMode
+    {
+        Request,
+        Repeat,
+        Duration,
+        InfiniteLoop
+    }
 }
diff --git a/src/DFrame.Controller/Pages/Index.razor.cs b/src/DFrame.Controller/Pages/Index.razor.cs
@@ -83,7 +83,7 @@ async Task HandleExecute()
 
         var totalRequest = (vm.CommandMode == CommandMode.InfiniteLoop || vm.CommandMode == CommandMode.Duration) ? long.MaxValue : vm.TotalRequest;
 
-        var okToStart = engine.StartWorkerFlow(vm.SelectedWorkload, vm.Concurrency, totalRequest, vm.RequestWorkerLimit, parameters!);
+        var okToStart = engine.StartWorkerFlow(vm.CommandMode, vm.SelectedWorkload, vm.Concurrency, totalRequest, vm.RequestWorkerLimit, parameters!);
         if (!okToStart)
         {
             logger.LogInformation("Invalid parameters, does not run workflow.");
@@ -123,7 +123,7 @@ void WatchStateChangedForRepeat()
             {
                 if (state.TryMoveNextRepeat())
                 {
-                    var okToStart = engine.StartWorkerFlow(state.Workload, state.Concurrency, state.TotalRequest, state.WorkerLimit, state.Parameters!);
+                    var okToStart = engine.StartWorkerFlow(CommandMode.Repeat, state.Workload, state.Concurrency, state.TotalRequest, state.WorkerLimit, state.Parameters!);
                     if (okToStart)
                     {
                         return;
@@ -207,14 +207,6 @@ public bool TryMoveNextRepeat()
     }
 }
 
-public enum CommandMode
-{
-    Request,
-    Repeat,
-    Duration,
-    InfiniteLoop
-}
-
 public class IndexViewModel : IDisposable
 {
     readonly IExecutionResultHistoryProvider historyProvider;

diff --git a/src/DFrame.Controller/RestApi.cs b/src/DFrame.Controller/RestApi.cs
@@ -16,14 +16,14 @@ public static void RegisterRestApi(WebApplication app)
             // mode
             app.MapPost("api/request", (DFrameControllerExecutionEngine engine, [FromBody] RequestBody request) =>
             {
-                StartRequest(engine, request.Workload, request.Concurrency, request.TotalRequest, request.Workerlimit, request.Parameters, out var result);
+                StartRequest(engine, CommandMode.Request, request.Workload, request.Concurrency, request.TotalRequest, request.Workerlimit, request.Parameters, out var result);
                 return result;
             });
 
             app.MapPost("api/repeat", (DFrameControllerExecutionEngine engine, [FromBody] RepeatBody request) =>
             {
                 var workerLimit = request.Workerlimit ?? engine.CurrentConnectingCount;
-                var ok = StartRequest(engine, request.Workload, request.Concurrency, request.TotalRequest, workerLimit, request.Parameters, out var result);
+                var ok = StartRequest(engine, CommandMode.Repeat, request.Workload, request.Concurrency, request.TotalRequest, workerLimit, request.Parameters, out var result);
                 if (!ok) return result;
 
                 repeatModeState = new Pages.RepeatModeState(request.Workload, request.Concurrency, request.TotalRequest,
@@ -41,7 +41,7 @@ public static void RegisterRestApi(WebApplication app)
                         {
                             if (!repeatCancellation.IsCancellationRequested && state.TryMoveNextRepeat())
                             {
-                                var okToStart = engine.StartWorkerFlow(state.Workload, state.Concurrency, state.TotalRequest, state.WorkerLimit, state.Parameters!);
+                                var okToStart = engine.StartWorkerFlow(CommandMode.Repeat, state.Workload, state.Concurrency, state.TotalRequest, state.WorkerLimit, state.Parameters!);
                                 if (okToStart)
                                 {
                                     return;
@@ -61,7 +61,7 @@ public static void RegisterRestApi(WebApplication app)
             app.MapPost("api/duration", (DFrameControllerExecutionEngine engine, [FromBody] DurationBody request) =>
             {
                 var totalRequest = long.MaxValue;
-                var ok = StartRequest(engine, request.Workload, request.Concurrency, totalRequest, request.Workerlimit, request.Parameters, out var result);
+                var ok = StartRequest(engine, CommandMode.Duration, request.Workload, request.Concurrency, totalRequest, request.Workerlimit, request.Parameters, out var result);
                 if (!ok) return result;
 
                 durationCancellationTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(request.ExecuteTimeSeconds));
@@ -76,7 +76,7 @@ public static void RegisterRestApi(WebApplication app)
             app.MapPost("api/infinite", (DFrameControllerExecutionEngine engine, [FromBody] InfiniteBody request) =>
             {
                 var totalRequest = long.MaxValue;
-                StartRequest(engine, request.Workload, request.Concurrency, totalRequest, request.Workerlimit, request.Parameters, out var result);
+                StartRequest(engine, CommandMode.InfiniteLoop, request.Workload, request.Concurrency, totalRequest, request.Workerlimit, request.Parameters, out var result);
                 return result;
             });
 
@@ -124,7 +124,7 @@ public static void RegisterRestApi(WebApplication app)
                 return new { summary = r.Value.Summary, results = r.Value.Results };
             });
 
-            static bool StartRequest(DFrameControllerExecutionEngine engine, string workload, int concurrency, long totalRequest, int? workerlimit, Dictionary<string, string?>? parameters, out IResult result)
+            static bool StartRequest(DFrameControllerExecutionEngine engine, CommandMode commandMode, string workload, int concurrency, long totalRequest, int? workerlimit, Dictionary<string, string?>? parameters, out IResult result)
             {
                 if (engine.IsRunning)
                 {
@@ -134,7 +134,7 @@ static bool StartRequest(DFrameControllerExecutionEngine engine, string workload
 
                 try
                 {
-                    var ok = engine.StartWorkerFlow(workload, concurrency, totalRequest, workerlimit ?? engine.CurrentConnectingCount, parameters?.ToArray() ?? Array.Empty<KeyValuePair<string, string?>>());
+                    var ok = engine.StartWorkerFlow(commandMode, workload, concurrency, totalRequest, workerlimit ?? engine.CurrentConnectingCount, parameters?.ToArray() ?? Array.Empty<KeyValuePair<string, string?>>());
                     if (!ok)
                     {
                         result = Results.BadRequest("can not start.");

diff --git a/src/DFrame.Unity/Assets/Plugins/DFrame/Runtime/DFrameWorkerApp.cs b/src/DFrame.Unity/Assets/Plugins/DFrame/Runtime/DFrameWorkerApp.cs
@@ -260,7 +260,7 @@ async Task ConnectAsync(CancellationToken applicationLifeTime)
             logger.LogInformation($"Connect completed.");
         }
 
-        async void IWorkerReceiver.CreateWorkloadAndSetup(ExecutionId executionId, int createCount, int concurrency, long totalRequestCount, string workloadName, KeyValuePair<string, string>[] parameters)
+        async void IWorkerReceiver.CreateWorkloadAndSetup(CommandMode commandMode, ExecutionId executionId, int createCount, int concurrency, long totalRequestCount, string workloadName, KeyValuePair<string, string>[] parameters)
         {
             ThreadPoolUtility.SetMinThread(createCount * options.VirtualProcess * 2);
 
@@ -277,7 +277,7 @@ async void IWorkerReceiver.CreateWorkloadAndSetup(ExecutionId executionId, int c
                 for (int i = 0; i < createCount; i++)
                 {
                     var workload = description.Activator.Value.Invoke(serviceProvider, description.CrateArgument(parameters));
-                    var t = (new WorkloadContext(executionId, createCount, i, concurrency, totalRequestCount, workloadLifeTime!.Token), (Workload)workload);
+                    var t = (new WorkloadContext(commandMode, executionId, createCount, i, concurrency, totalRequestCount, workloadLifeTime!.Token), (Workload)workload);
                     workloads.Add(t);
                 }
 

diff --git a/src/DFrame.Unity/Assets/Plugins/DFrame/Runtime/WorkloadContext.cs b/src/DFrame.Unity/Assets/Plugins/DFrame/Runtime/WorkloadContext.cs
@@ -4,6 +4,7 @@ namespace DFrame
 {
     public class WorkloadContext
     {
+        public CommandMode CommandMode { get; }
         public ExecutionId ExecutionId { get; }
         public WorkloadId WorkloadId { get; }
         public int WorkloadCount { get; }
@@ -13,8 +14,9 @@ public class WorkloadContext
         public long TotalRequestCount { get; }
         public CancellationToken CancellationToken { get; }
 
-        public WorkloadContext(ExecutionId executionId, int count, int index, int concurrency, long totalRequestCount, CancellationToken cancellationToken)
+        public WorkloadContext(CommandMode commandMode, ExecutionId executionId, int count, int index, int concurrency, long totalRequestCount, CancellationToken cancellationToken)
         {
+            this.CommandMode = commandMode;
             this.ExecutionId = executionId;
             this.WorkloadId = WorkloadId.New();
             this.WorkloadCount = count;

diff --git a/src/DFrame.Worker/DFrameWorkerApp.cs b/src/DFrame.Worker/DFrameWorkerApp.cs
@@ -260,7 +260,7 @@ async Task ConnectAsync(CancellationToken applicationLifeTime)
             logger.LogInformation($"Connect completed.");
         }
 
-        async void IWorkerReceiver.CreateWorkloadAndSetup(ExecutionId executionId, int createCount, int concurrency, long totalRequestCount, string workloadName, KeyValuePair<string, string>[] parameters)
+        async void IWorkerReceiver.CreateWorkloadAndSetup(CommandMode commandMode, ExecutionId executionId, int createCount, int concurrency, long totalRequestCount, string workloadName, KeyValuePair<string, string>[] parameters)
         {
             ThreadPoolUtility.SetMinThread(createCount * options.VirtualProcess * 2);
 
@@ -277,7 +277,7 @@ async void IWorkerReceiver.CreateWorkloadAndSetup(ExecutionId executionId, int c
                 for (int i = 0; i < createCount; i++)
                 {
                     var workload = description.Activator.Value.Invoke(serviceProvider, description.CrateArgument(parameters));
-                    var t = (new WorkloadContext(executionId, createCount, i, concurrency, totalRequestCount, workloadLifeTime!.Token), (Workload)workload);
+                    var t = (new WorkloadContext(commandMode, executionId, createCount, i, concurrency, totalRequestCount, workloadLifeTime!.Token), (Workload)workload);
                     workloads.Add(t);
                 }
 

diff --git a/src/DFrame.Worker/WorkloadContext.cs b/src/DFrame.Worker/WorkloadContext.cs
@@ -4,6 +4,7 @@ namespace DFrame
 {
     public class WorkloadContext
     {
+        public CommandMode CommandMode { get; }
         public ExecutionId ExecutionId { get; }
         public WorkloadId WorkloadId { get; }
         public int WorkloadCount { get; }
@@ -13,8 +14,9 @@ public class WorkloadContext
         public long TotalRequestCount { get; }
         public CancellationToken CancellationToken { get; }
 
-        public WorkloadContext(ExecutionId executionId, int count, int index, int concurrency, long totalRequestCount, CancellationToken cancellationToken)
+        public WorkloadContext(CommandMode commandMode, ExecutionId executionId, int count, int index, int concurrency, long totalRequestCount, CancellationToken cancellationToken)
         {
+            this.CommandMode = commandMode;
             this.ExecutionId = executionId;
             this.WorkloadId = WorkloadId.New();
             this.WorkloadCount = count;