From 66e1102e3975bed1f322889c4d07e8a372c4f791 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 17 Oct 2023 01:13:13 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B5=D1=80=D1=8B=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=20=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B7=D1=86=D1=83=20=D0=B4=D0=B2=D0=BC,=20=D0=BE=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B8=D0=BF=D0=BD=D0=BE=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 11 +---
 src/Repository/Server/ServerCode.java         |  1 -
 .../SapforTasksPackage.java                   |  2 +
 .../SapforTasksPackageSupervisor.java         | 63 +++++++++++++------
 src/TestingSystem/TestingServer.java          | 37 -----------
 .../Passes/All/AbortSapforTaskPackage.java    | 23 +++++--
 6 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1aed6bc4..6f79edb3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.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/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestingBar/TestingBar.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Group/GroupInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Group/GroupInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.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/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index 8388202b..e781a198 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -70,6 +70,5 @@ public enum ServerCode {
     InstallSapforForTesting,
     StartSapforTests,
     GetFirstActiveSapforTasksPackage,
-    AbortSapforTasksPackage,
     OLD
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index 6668fa48..034fda17 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -12,6 +12,7 @@ public class SapforTasksPackage extends nDBObject {
     public String sapfor_version = "?"; //тестируемая версия SAPFOR
     public long sapfor_build_date = 0;
     public String sapfor_drv="";
+    public String sapfor_process_name="";
     //---
     public String workspace = ""; //домашняя папка
     //---
@@ -46,6 +47,7 @@ public class SapforTasksPackage extends nDBObject {
         StartDate = p.StartDate;
         ChangeDate = p.ChangeDate;
         kernels = p.kernels;
+        sapfor_process_name = p.sapfor_process_name;
         state = p.state;
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 51a3e2fe..05e99c22 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -18,12 +18,13 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforTasksPackageSupervisor {
     protected TestingPlanner planner; //планировщик.
     SapforTasksPackage sapforTasksPackage = null;
-    public SapforTasksPackageSupervisor(TestingPlanner planner_in, SapforTasksPackage sapforTasksPackage_in){
+    public SapforTasksPackageSupervisor(TestingPlanner planner_in, SapforTasksPackage sapforTasksPackage_in) {
         planner = planner_in;
         sapforTasksPackage = sapforTasksPackage_in;
     }
@@ -78,7 +79,7 @@ public class SapforTasksPackageSupervisor {
         FileUtils.copyFile(new File(sapforTasksPackage.sapfor_drv), sapforFile);
         if (!sapforFile.setExecutable(true))
             throw new Exception("Не удалось сделать файл " + sapforFile.getName() + " исполняемым!");
-        package_json.sapfor_drv = sapforFile.getName();
+        sapforTasksPackage.sapfor_process_name = package_json.sapfor_drv = sapforFile.getName();
         //--->>
         //копирование визуализатора
         File visualiser = new File(sapforTasksPackage.workspace, "VisualSapfor.jar");
@@ -94,7 +95,6 @@ public class SapforTasksPackageSupervisor {
         Utils.createScript(packageWorkspace, packageWorkspace, "start", "java -jar VisualSapfor.jar");
         //--
     }
-
     void PackageStart() throws Exception {
         System.out.println("start sapfor package " + sapforTasksPackage.id);
         File workspace = new File(sapforTasksPackage.workspace);
@@ -104,7 +104,7 @@ public class SapforTasksPackageSupervisor {
         procBuilder.start();
         //--->>
         File started = new File(sapforTasksPackage.workspace, Constants.STARTED);
-        while (!started.exists()){
+        while (!started.exists()) {
             System.out.println("waiting for package start...");
             Utils.sleep(1000);
         }
@@ -130,21 +130,48 @@ public class SapforTasksPackageSupervisor {
         }
     }
     //--
+    public boolean packageNeedsKill() throws Exception {
+        return (boolean) planner.ServerCommand(ServerCode.CheckPackageToKill, sapforTasksPackage.id);
+    }
+    public void killPackage() throws Exception {
+        //----
+        File interrupt_file = new File(sapforTasksPackage.workspace, Constants.INTERRUPT);
+        //----
+        FileUtils.writeStringToFile(interrupt_file, new Date().toString());
+        File aborted_file = new File(sapforTasksPackage.workspace, Constants.ABORTED);
+        do {
+            System.out.println("waiting for interrupt...");
+            Thread.sleep(1000);
+        } while (!aborted_file.exists());
+        System.out.println("coup de grace..");
+        String kill_command = "killall -SIGKILL " + sapforTasksPackage.sapfor_process_name;
+        System.out.println(kill_command);
+        Process killer = Runtime.getRuntime().exec(kill_command);
+        killer.waitFor();
+        System.out.println("done!");
+    }
     public void Perform() throws Exception {
-        switch (sapforTasksPackage.state) {
-            case TestsSynchronize:
-                TestsSynchronize();
-                sapforTasksPackage.state = TasksPackageState.RunningPreparation;
-                planner.UpdateSapforPackage(sapforTasksPackage);
-                break;
-            case RunningPreparation:
-                PackageStart();
-                break;
-            case RunningExecution:
-                CheckPackageState();
-                break;
-            default:
-                break;
+        if (packageNeedsKill()) {
+            System.out.println("PACKAGE " + sapforTasksPackage.id + " NEEDS TO KILL");
+            killPackage();
+            sapforTasksPackage.state = TasksPackageState.Aborted;
+            planner.UpdateSapforPackage(sapforTasksPackage);
+        } else {
+            switch (sapforTasksPackage.state) {
+                case TestsSynchronize:
+                    TestsSynchronize();
+                    sapforTasksPackage.state = TasksPackageState.RunningPreparation;
+                    planner.UpdateSapforPackage(sapforTasksPackage);
+                    break;
+                case RunningPreparation:
+                    PackageStart();
+                    break;
+                case RunningExecution:
+                    CheckPackageState();
+                    break;
+                default:
+                    break;
+            }
         }
     }
 }
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 3fc37fea..fc38e525 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -1,5 +1,4 @@
 package TestingSystem;
-import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.rDBObject;
 import Common.Global;
@@ -22,7 +21,6 @@ import TestingSystem.Tasks.TestCompilationTask;
 import TestingSystem.Tasks.TestRunTask;
 import TestingSystem.Tasks.TestTask;
 import TestingSystem.TasksPackage.TasksPackage;
-import TestingSystem.TasksPackage.TasksPackageState;
 import TestingSystem.TasksPackageToKill.TasksPackageToKill;
 import TestingSystem.Test.Test;
 import TestingSystem.Test.TestInterface;
@@ -39,7 +37,6 @@ import javax.swing.*;
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Comparator;
-import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 import java.util.stream.Collectors;
@@ -314,31 +311,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         groups.sort(Comparator.comparing(o -> o.description));
         return groups;
     }
-    private void AbortSapforTasksPackage(SapforTasksPackage object) throws Exception {
 
-        if (object.state.equals(TasksPackageState.RunningExecution)) {
-            File workspace = new File(object.workspace);
-            //----
-            File interrupt_file = new File(object.workspace, Constants.INTERRUPT);
-            //----
-            FileUtils.writeStringToFile(interrupt_file, new Date().toString());
-            File aborted_file = new File(object.workspace, Constants.ABORTED);
-            do {
-                System.out.println("waiting for interrupt...");
-                Thread.sleep(1000);
-            } while (!aborted_file.exists());
-            System.out.println("coup de grace..");
-            File[] files = workspace.listFiles((dir, name) -> name.startsWith("SAPFOR_F_"));
-            if ((files != null) && (files.length > 0)) {
-                File sapfor = files[0];
-                String kill_command = "killall -SIGKILL " + sapfor.getName();
-                System.out.println(kill_command);
-                Process killer = Runtime.getRuntime().exec(kill_command);
-                killer.waitFor();
-                System.out.println("done!");
-            } else throw new Exception("Не найдена копия SAPFOR");
-        }else throw new RepositoryRefuseException()
-    }
     @Override
     protected void Session() throws Exception {
         DBObject dbObject = null;
@@ -351,16 +324,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 //------------->>
                 response = new ServerExchangeUnit_2021(ServerCode.OK);
                 break;
-            case AbortSapforTasksPackage:
-                Print("Прервать пакет тестов SAPFOR");
-                SetCurrentAccountDB(request.arg);
-                if (account_db.sapforTasksPackages.containsKey(request.object)) {
-                    SapforTasksPackage sapforTasksPackage = account_db.sapforTasksPackages.get(request.object);
-                    AbortSapforTasksPackage(sapforTasksPackage);
-                    response = new ServerExchangeUnit_2021(ServerCode.OK);
-                } else throw new RepositoryRefuseException("Не существует пакета " + Utils.Brackets(request.object));
-                break;
-            //--
             case CheckPackageToKill:
                 SetCurrentAccountDB(request.arg);
                 String packageName = (String) request.object;
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
index ee113d5b..8ee68ac2 100644
--- a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
@@ -3,8 +3,12 @@ import Common.Current;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import TestingSystem.TasksPackageToKill.TasksPackageToKill;
 import Visual_DVM_2021.Passes.TestingSystemPass;
+
+import java.util.Vector;
 public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage> {
+    Vector<TasksPackageToKill> packagesToKill;
     @Override
     public String getIconPath() {
         return "/icons/Ban.PNG";
@@ -15,14 +19,25 @@ public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.SapforTasksPackage)){
+        if (Current.Check(Log, Current.SapforTasksPackage)) {
+            packagesToKill = new Vector<>();
             target = Current.getSapforTasksPackage();
-            return true;
-        };
+            switch (target.state) {
+                case Done:
+                case Aborted:
+                    break;
+                default:
+                    TasksPackageToKill tasksPackageToKill = new TasksPackageToKill();
+                    tasksPackageToKill.packageName = target.id;
+                    packagesToKill.add(tasksPackageToKill);
+                    return true;
+            }
+        }
+        ;
         return false;
     }
     @Override
     protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.AbortSapforTasksPackage, Current.getAccount().email, target.id));
+        Command(new ServerExchangeUnit_2021(ServerCode.PublishAccountObjects, Current.getAccount().email, packagesToKill));
     }
 }