From 04cf5c15525e56ad2b65836a0340a1207505e01f Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 14 Mar 2025 01:14:56 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=89=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 ++--
 src/_VisualDVM/Constants.java                 |  8 ++---
 .../TestingSystem/Common/TestingPlanner.java  |  1 -
 .../DVM/RemoteDVMTestingPlanner.java          | 33 ++++++++++--------
 .../SAPFOR/SapforTestingPlanner.java          |  2 +-
 src/files/Supervisor.h                        | 34 +++++++++++--------
 src/files/version.h                           |  2 +-
 7 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index acd72aca..abdf656a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,14 +8,11 @@
   <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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/File.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/File.h" 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/launcher.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/launcher.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/files/starter.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/starter.cpp" 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" />
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 9b2b60e2..a2667c3f 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,8 +3,8 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1208;
-    public static final int planner_version = 18;
+    public static final int version = 1209;
+    public static final int planner_version = 20;
     public static final int testingMaxKernels = 64;
     //--
     public static final String ApplicationFileName = "VisualSapfor.jar";
@@ -469,7 +469,7 @@ public class Constants {
     };
     public static Vector<String> admins_mails = new Vector_<>(
       "sapfor.tracker@internet.ru",
-            "vmk-post@yandex.ru",
-            "79854210702@ya.ru"
+            "vmk-post@yandex.ru"
+            ,"79854210702@ya.ru"
     );
 }
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
index 802a778a..ee96c74a 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
@@ -179,7 +179,6 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
                                 break;
                             case RunningEnd:
                                 DownloadResults();
-                                UpdatePackageState(TasksPackageState.Analysis);
                                 break;
                             case Paused:
                                 if (!checkIfPaused() && CheckNextState())
diff --git a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 9c50dc67..1a30e6c4 100644
--- a/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -243,6 +243,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
             switch (testingPackage.state) {
                 case CompilationExecution:
                 case RunningExecution:
+                case Aborted:
                     EmailPackage();
                     break;
             }
@@ -252,20 +253,24 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
     @Override
     protected void DownloadResults() throws Exception {
         Utils_.CheckDirectory(packageLocalWorkspace);
-        RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace, "results.zip");
-        File results_archive = new File(packageLocalWorkspace, "results.zip");
-        user.connection.performScript(packageRemoteWorkspace, "zip -r " + Utils_.DQuotes("results.zip") + " " + Utils_.DQuotes("results"));
-        //---
-        if (user.connection.Exists(remote_results_archive)) {
-            user.connection.getSingleFile(remote_results_archive.full_name, results_archive.getAbsolutePath());
-            UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
-            unzipFolderPass.Do(results_archive.getAbsolutePath(), packageLocalWorkspace.getAbsolutePath(), false);
+        RemoteFile killedFile = new RemoteFile(packageRemoteWorkspace,"kill");
+        if (user.connection.Exists(killedFile)){
+            UpdatePackageState(TasksPackageState.Aborted);
+        }else {
+            RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace, "results.zip");
+            File results_archive = new File(packageLocalWorkspace, "results.zip");
+            user.connection.performScript(packageRemoteWorkspace, "zip -r " + Utils_.DQuotes("results.zip") + " " + Utils_.DQuotes("results"));
+            //---
+            if (user.connection.Exists(remote_results_archive)) {
+                user.connection.getSingleFile(remote_results_archive.full_name, results_archive.getAbsolutePath());
+                UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
+                unzipFolderPass.Do(results_archive.getAbsolutePath(), packageLocalWorkspace.getAbsolutePath(), false);
+            }
+            UpdatePackageState(TasksPackageState.Analysis);
         }
         //---
-        /*
-        if (user.connection.Exists(packageRemoteWorkspace))
+         if (user.connection.Exists(packageRemoteWorkspace))
             user.connection.RMDIR(packageRemoteWorkspace.full_name);
-         */
     }
     @Override
     protected void MachineConnectionError() {
@@ -274,10 +279,8 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
     @Override
     protected void Kill() throws Exception {
         if (!testingPackage.PID.isEmpty()) {
-            user.connection.Command("kill -9 " + testingPackage.PID);
-            //очистка после прерывания.
-           // if (user.connection.Exists(packageRemoteWorkspace))
-           //     user.connection.RMDIR(packageRemoteWorkspace.full_name);
+            RemoteFile killFile = new RemoteFile(packageRemoteWorkspace, "kill");
+            user.connection.writeToFile("fatality", killFile);
         }
     }
     @Override
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 91808c90..70355a78 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -148,7 +148,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
     }
     @Override
     protected void DownloadResults() throws Exception {
-        //не требуется.
+        UpdatePackageState(TasksPackageState.Analysis);
     }
     @Override
     protected void AnalyseResults() throws Exception {
diff --git a/src/files/Supervisor.h b/src/files/Supervisor.h
index 7d651c32..aa58e37b 100644
--- a/src/files/Supervisor.h
+++ b/src/files/Supervisor.h
@@ -28,7 +28,7 @@ template <class T>
 class Supervisor : public Array <T> {
 protected:
     SupervisorState state;
-
+    bool killed;
 public:
     virtual String getStatePrefix() {
         return String("");
@@ -48,11 +48,16 @@ public:
         }
     }
     //-
+    void ToLog(const String& text){
+        FILE * pfile = fopen("planner_log.txt", "a");
+        fprintf(pfile, "%s\n", text.getCharArray());
+        fclose(pfile);
+    }
+    //--
     void print() {
         for (auto& elem : this->getElements())
             elem->print();
     }
-
     void init(const char* fileName, int recordSize) {
         state = WorkspacesCreation;
         File* packedTasks = new File(fileName);
@@ -162,7 +167,7 @@ public:
 
         auto timer_pause = Utils::getAbsoluteTime();
         auto timer_killed = Utils::getAbsoluteTime();
-        bool killed = false;
+        killed = false;
 
         while (activeTasks) {
             long oldActiveTasks = activeTasks;
@@ -231,15 +236,17 @@ public:
             // прошло больше 10 секунд, проверяем нужно ли завершиться
             if (Utils::getAbsoluteTime() - timer_killed > 10) {
                 if (checkKilled()) {
-                    printf("killed\n");
-
+                    ToLog("killed");
                     while (busyKernels) {
-                        printf("waiting for activeTasks %lu\n", activeTasks);
+                        ToLog("activeTasks="+ String((int)activeTasks)+";busyKernels="+String((int)busyKernels));
                         checkTasksFinish(activeTaskSet, toDel, activeTasks, done, busyKernels, buf);
+                           // очищаем завершенные задачи
+                        for (auto& del : toDel)
+                           activeTaskSet.erase(del);
+                        toDel.clear();
                         Utils::Sleep(5);
                     }
-
-                    printf("exit for main while\n");
+                    ToLog("exit for main while");
                     killed = true;
                     break;
                 }
@@ -251,17 +258,19 @@ public:
             for (auto& task : taskList)
                 task->copyResults(pathRes);
         }
-
         changeState();
         String outFile(pathRes + "/" + getStatePrefix() + "Info.txt");
         File tmp(outFile, String(buf.c_str()));
+        //скопировать в результаты лог планировщика.
+        if (killed){
+            ToLog("quit application");
+            std::exit(0);
+        }
     }
-
     void saveState() {
         String stateFile = packageWorkspace + "/state/" + getStatePrefix() + printState();
         File tmp(stateFile, Utils::getDate());
     }
-
     void saveProgress(long long persentDone) {
        FILE* f = fopen("progress", "w");
        if (f) {
@@ -270,15 +279,12 @@ public:
            fclose(f);
        }
     }
-
     bool checkPause() const {
         return Utils::Exists("pause");
     }
-
     bool checkKilled() const {
         return Utils::Exists("kill");
     }
-
     void checkTasksFinish(const set<T*>& activeTaskSet, vector<T*>& toDel, size_t& activeTasks, 
                           size_t& done, int& busyKernels, string& buf) {
         // проверяем нет ли завершившихся задач
diff --git a/src/files/version.h b/src/files/version.h
index 25bf17fc..2edeafb0 100644
--- a/src/files/version.h
+++ b/src/files/version.h
@@ -1 +1 @@
-18
\ No newline at end of file
+20
\ No newline at end of file