From 9f4eb9d88e5c52de9c922ecd4a09aa9a876f49db Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 14 Mar 2025 10:35:24 +0300
Subject: [PATCH] =?UTF-8?q?fix.=D0=B4=D0=BE=D0=B4=D0=B5=D0=B4=D0=B0=D0=BB?=
 =?UTF-8?q?=20=D1=8D=D1=82=D0=B0=D0=BF=20=D0=BF=D1=80=D0=B5=D1=80=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8?=
 =?UTF-8?q?=D0=BB=D1=8F=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                            |  3 ---
 src/_VisualDVM/Constants.java                  |  2 +-
 .../TestingSystem/Common/TestingPlanner.java   |  1 -
 .../SAPFOR/SapforTestingPlanner.java           |  1 +
 src/files/Supervisor.h                         | 18 +++++++++++-------
 src/files/version.h                            |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index abdf656a..cda8768d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,12 +8,9 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/files/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Supervisor.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index a2667c3f..a16a7359 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -4,7 +4,7 @@ import Common.Utils.Vector_;
 import java.util.Vector;
 public class Constants {
     public static final int version = 1209;
-    public static final int planner_version = 20;
+    public static final int planner_version = 21;
     public static final int testingMaxKernels = 64;
     //--
     public static final String ApplicationFileName = "VisualSapfor.jar";
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
index ee96c74a..debfcc2a 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
@@ -157,7 +157,6 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
                     if (ptk_id != CommonConstants.Nan) {
                         Print("package " + testingPackage.id + " NEEDS TO KILL");
                         Kill();
-                        UpdatePackageState(TasksPackageState.Aborted);
                         ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
                     } else if (checkIfPaused()) {
                         UpdatePackageState(TasksPackageState.Paused);
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 70355a78..e120f38b 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -219,6 +219,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
         Process killer = Runtime.getRuntime().exec(kill_command);
         killer.waitFor();
         Print("done!");
+        UpdatePackageState(TasksPackageState.Aborted);
     }
     //--
     @Override
diff --git a/src/files/Supervisor.h b/src/files/Supervisor.h
index aa58e37b..321d26ef 100644
--- a/src/files/Supervisor.h
+++ b/src/files/Supervisor.h
@@ -257,20 +257,24 @@ public:
         if (!killed) {
             for (auto& task : taskList)
                 task->copyResults(pathRes);
+            changeState();
+            String outFile(pathRes + "/" + getStatePrefix() + "Info.txt");
+            File tmp(outFile, String(buf.c_str()));
         }
-        changeState();
-        String outFile(pathRes + "/" + getStatePrefix() + "Info.txt");
-        File tmp(outFile, String(buf.c_str()));
-        //скопировать в результаты лог планировщика.
-        if (killed){
+        else  {
+            //всегда финальное состояние.
+            saveState("RunningEnd");
             ToLog("quit application");
             std::exit(0);
         }
     }
-    void saveState() {
-        String stateFile = packageWorkspace + "/state/" + getStatePrefix() + printState();
+    void saveState(const String& state_text){
+        String stateFile = packageWorkspace + "/state/" + state_text;
         File tmp(stateFile, Utils::getDate());
     }
+    void saveState() {
+        saveState(getStatePrefix() + printState());
+    }
     void saveProgress(long long persentDone) {
        FILE* f = fopen("progress", "w");
        if (f) {
diff --git a/src/files/version.h b/src/files/version.h
index 2edeafb0..b5045cc4 100644
--- a/src/files/version.h
+++ b/src/files/version.h
@@ -1 +1 @@
-20
\ No newline at end of file
+21
\ No newline at end of file