From 21914e3ba1bff1d79137d5ec24231574fdabae5c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 14 Nov 2023 16:19:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D1=85=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=87=D0=B0=D1=85=20=D0=B2=20=D0=BB=D0=BE=D0=B3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 19 +++++----------
 .../PackageModeSupervisor.java                | 20 +++++++---------
 .../PerformSapforTask.java                    | 13 ++--------
 .../SapforTask/SapforTask.java                |  8 +++++++
 src/SapforTestingSystem/TaskThread.java       | 21 ++++++++++++++++
 .../ThreadTask/ThreadTask.java                | 10 --------
 .../ThreadsPlanner/ThreadsPlanner.java        | 24 ++++++++++++++-----
 7 files changed, 63 insertions(+), 52 deletions(-)
 create mode 100644 src/SapforTestingSystem/TaskThread.java
 delete mode 100644 src/SapforTestingSystem/ThreadTask/ThreadTask.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7d8805b7..530131a0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,20 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/TaskThread.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/UI/PublishFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/RepositoryServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Interface/TestingWindow.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/MainForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadTask/ThreadTask.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
index 9e517c07..4af0d921 100644
--- a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
+++ b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
@@ -6,8 +6,8 @@ import SapforTestingSystem.Json.SapforConfiguration_json;
 import SapforTestingSystem.Json.SapforTasksPackage_json;
 import SapforTestingSystem.Json.SapforTasksResults_json;
 import SapforTestingSystem.Json.SapforTest_json;
-import SapforTestingSystem.PerformSapforTask;
 import SapforTestingSystem.SapforTask.SapforTask;
+import SapforTestingSystem.TaskThread;
 import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import org.apache.commons.io.FileUtils;
@@ -39,26 +39,22 @@ public class PackageModeSupervisor extends ThreadsPlanner {
                 task.sapfortaskspackage_id = new File(Global.Home).getName();
                 results_json.tasks.add(task);
                 Vector<String> codes_s = new Vector<>();
-                for (PassCode_2021 code: sapforConfiguration_json.codes){
+                for (PassCode_2021 code : sapforConfiguration_json.codes) {
                     codes_s.add(code.toString());
                 }
                 task.codes = String.join(" ", codes_s);
                 //---
-                addThread(() -> {
-                    while (!task.state.isComplete()) {
-                        task.Reset();
-                        new PerformSapforTask().Do(
-                                sapfor_drv,
-                                sapforConfiguration_json,
-                                task
-                        );
-                    }
-                });
+                addThread(new TaskThread(task, sapfor_drv, sapforConfiguration_json));
             }
         }
         interruptThread.start();
     }
     @Override
+    public String printThread(Integer id) {
+        TaskThread taskThread = (TaskThread) threads.get(id);
+        return taskThread.task.getSummary();
+    }
+    @Override
     protected void finalize() {
         results_json.EndDate = new Date().getTime();
         //записать результаты всех задач.
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index e54c3ece..2835fd4d 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -22,7 +22,8 @@ import static java.lang.Character.isDigit;
 public class PerformSapforTask extends Pass_2021<SapforTask> {
     @Override
     public String getDescription() {
-        return "Запуск задачи SAPFOR";
+        return "";
+            //    "Запуск задачи SAPFOR"; Оставляем пустое описание чтобы не засорять журнал.
     }
     @Override
     protected boolean needsAnimation() {
@@ -359,14 +360,4 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
                 break;
         }
     }
-    @Override
-    protected void performFinish() throws Exception {
-        /*
-        //теперь строим деревья версий. нельзя делать в body. так как могут быть исключения например неверный код процесса.
-        for (SapforVersion_json version : target.versions)
-            createVersionProjectData(version, true);
-        for (SapforVersion_json version : target.variants)
-            createVersionProjectData(version, false);
-         */
-    }
 }
diff --git a/src/SapforTestingSystem/SapforTask/SapforTask.java b/src/SapforTestingSystem/SapforTask/SapforTask.java
index b629455a..d4998b76 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask.java
@@ -58,6 +58,14 @@ public class SapforTask extends DBObject {
     public String getUniqueKey() {
         return sapfor_configuration_id + "_" + group_description + "_" + test_description;
     }
+    public String getSummary() {
+        Vector<String> lines = new Vector<>();
+        lines.add(group_description);
+        lines.add(test_description);
+        lines.add(codes);
+        lines.add(flags);
+        return String.join(" ", lines);
+    }
     //-----------
     public SapforTask() {
     }
diff --git a/src/SapforTestingSystem/TaskThread.java b/src/SapforTestingSystem/TaskThread.java
new file mode 100644
index 00000000..ef64d6ac
--- /dev/null
+++ b/src/SapforTestingSystem/TaskThread.java
@@ -0,0 +1,21 @@
+package SapforTestingSystem;
+import SapforTestingSystem.Json.SapforConfiguration_json;
+import SapforTestingSystem.SapforTask.SapforTask;
+
+import java.io.File;
+public class TaskThread extends Thread {
+    public SapforTask task = null;
+    public TaskThread(SapforTask task_, File sapfor_drv, SapforConfiguration_json sapforConfiguration_json) {
+        super(() -> {
+            while (!task_.state.isComplete()) {
+                task_.Reset();
+                new PerformSapforTask().Do(
+                        sapfor_drv,
+                        sapforConfiguration_json,
+                        task_
+                );
+            }
+        });
+        task = task_;
+    }
+}
diff --git a/src/SapforTestingSystem/ThreadTask/ThreadTask.java b/src/SapforTestingSystem/ThreadTask/ThreadTask.java
deleted file mode 100644
index 73224fb1..00000000
--- a/src/SapforTestingSystem/ThreadTask/ThreadTask.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package SapforTestingSystem.ThreadTask;
-import Common.Constants;
-public class ThreadTask {
-    public int id = Constants.Nan;
-    public Thread thread;
-    public ThreadTask(int id_in, Runnable runnable){
-        id = id_in;
-        thread = new Thread(runnable);
-    }
-}
diff --git a/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java b/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java
index 1bc5cc93..648bc5d3 100644
--- a/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java
+++ b/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java
@@ -27,17 +27,31 @@ public abstract class ThreadsPlanner {
     public ThreadsPlanner(int wait_ms_in) {
         wait_ms = wait_ms_in;
     }
-    public void setMaxKernels(int maxKernels_in){
+    public void setMaxKernels(int maxKernels_in) {
         maxKernels = maxKernels_in;
         kernels = maxKernels;
     }
+    public String printThread(Integer id) {
+        return "thread id = "+id;
+    }
+    public String getThreadsSummary() {
+        Vector<String> lines = new Vector<>();
+        lines.add("Planner summary:");
+        lines.add("Waiting: " + waitingThreads.size());
+        lines.add("Running: " + activeThreads.size());
+        for (Integer id : activeThreads) {
+            lines.add(printThread(id));
+        }
+        lines.add("");
+        return String.join("\n", lines);
+    }
     //--
     public void Start() {
         Global.Log.Print("Planner started");
         try {
             //--
             while (!waitingThreads.isEmpty() || !activeThreads.isEmpty()) {
-                Global.Log.Print("Waiting: " + waitingThreads.size() + "; Running: " + activeThreads.size() + ".");
+                Global.Log.Print(getThreadsSummary());
                 checkActiveThreads();
                 tryStartThreads();
                 Thread.sleep(wait_ms);
@@ -45,8 +59,7 @@ public abstract class ThreadsPlanner {
             //--
         } catch (Exception exception) {
             Global.Log.PrintException(exception);
-        }
-        finally {
+        } finally {
             Global.Log.Print("Planner finished");
             finalize();
         }
@@ -82,8 +95,7 @@ public abstract class ThreadsPlanner {
     }
     protected void finalize() {
     }
-    protected void addThread(Runnable runnable) {
-        Thread thread = new Thread(runnable);
+    protected void addThread(Thread thread) {
         threads.put(threadMaxId, thread);
         waitingThreads.add(threadMaxId);
         threadMaxId++;