From 19f7230eb5a260ea4358e8d1cc980acfa4461711 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 17 Oct 2023 00:22:06 +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=B0=D0=BA=D0=B5=D1=82=D0=B0.=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D1=8B=D0=B9=20=D0=B2=D0=B0=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B0=D0=BD=D1=82.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 13 ++++++-
 src/Common/Current.java                       |  8 ++--
 .../SapforTasksPackagesBar.java               |  3 +-
 .../UI/Menus_2023/TestingBar/TestingBar.java  |  2 +-
 src/Repository/Server/ServerCode.java         |  1 +
 .../SapforTasksPackagesDBTable.java           |  2 +-
 src/TestingSystem/Group/GroupInterface.java   |  2 +-
 src/TestingSystem/TestingServer.java          | 37 +++++++++++++++++++
 .../Passes/All/AbortSapforTaskPackage.java    | 28 ++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 ++
 10 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index da31b9fd..1aed6bc4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,18 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <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/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" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/Current.java b/src/Common/Current.java
index 8701d102..2fcaed0f 100644
--- a/src/Common/Current.java
+++ b/src/Common/Current.java
@@ -33,7 +33,7 @@ public enum Current {
     Undefined,
     //--
     ServerSapfor,
-    SapforScenario,
+    SapforTasksPackage,
     SapforEtalonTaskResult,//самый левый пакет
     SapforTaskResult,
     //--
@@ -368,10 +368,10 @@ public enum Current {
         return (GlobalData.SapforProfile.SapforProfile) get(Current.SapforProfile);
     }
     public static boolean HasSapforTasksPackage() {
-        return get(Current.SapforScenario) != null;
+        return get(Current.SapforTasksPackage) != null;
     }
     public static SapforTestingSystem.SapforTasksPackage.SapforTasksPackage getSapforTasksPackage() {
-        return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforScenario);
+        return (SapforTestingSystem.SapforTasksPackage.SapforTasksPackage) get(Current.SapforTasksPackage);
     }
     //сапфоры установленные на тестовый сервер.
     public static boolean HasServerSapfor() {
@@ -385,7 +385,7 @@ public enum Current {
         switch (this) {
             case ServerSapfor:
                 return "тестовая версия SAPFOR";
-            case SapforScenario:
+            case SapforTasksPackage:
                 return "сценарий SAPFOR";
             case SapforProfile:
                 return "Профиль SAPFOR";
diff --git a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
index a8412c55..8dd4dcb3 100644
--- a/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
+++ b/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java
@@ -1,7 +1,8 @@
 package Common.UI.Menus_2023.SapforTasksPackagesBar;
 import Common.UI.Menus_2023.DataMenuBar;
+import Visual_DVM_2021.Passes.PassCode_2021;
 public class SapforTasksPackagesBar extends DataMenuBar {
     public SapforTasksPackagesBar() {
-        super("пакеты задач");
+        super("пакеты задач", PassCode_2021.AbortSapforTaskPackage);
     }
 }
diff --git a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
index 7a7e16b9..1cb65ba3 100644
--- a/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
+++ b/src/Common/UI/Menus_2023/TestingBar/TestingBar.java
@@ -25,7 +25,7 @@ public class TestingBar extends VisualiserMenuBar {
         add(sKernels = new JSpinner());
         sKernels.setPreferredSize(new Dimension(60, 26));
         sKernels.setMaximumSize(new Dimension(60, 26));
-        sKernels.setModel(new SpinnerNumberModel(TestingServer.kernels, 1, 16, 1));
+        sKernels.setModel(new SpinnerNumberModel(TestingServer.kernels, 1, 64, 1));
         UI.MakeSpinnerRapid(sKernels, e -> {
             TestingServer.kernels = (int) sKernels.getValue();
         });
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index e781a198..8388202b 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -70,5 +70,6 @@ public enum ServerCode {
     InstallSapforForTesting,
     StartSapforTests,
     GetFirstActiveSapforTasksPackage,
+    AbortSapforTasksPackage,
     OLD
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
index adf50034..71e22ed1 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java
@@ -13,7 +13,7 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
     }
     @Override
     public Current CurrentName() {
-        return Current.SapforScenario;
+        return Current.SapforTasksPackage;
     }
     @Override
     public String getSingleDescription() {
diff --git a/src/TestingSystem/Group/GroupInterface.java b/src/TestingSystem/Group/GroupInterface.java
index f15cf4e8..83ae8c85 100644
--- a/src/TestingSystem/Group/GroupInterface.java
+++ b/src/TestingSystem/Group/GroupInterface.java
@@ -14,7 +14,7 @@ import java.util.Vector;
 //https://stackoverflow.com/questions/2127318/java-how-can-i-do-dynamic-casting-of-a-variable-from-one-type-to-another
 public class GroupInterface {
     //-
-    public static boolean filterMyOnly = true;
+    public static boolean filterMyOnly = false;
     //--
     public static boolean isVisible(Group object) {
         return (!filterMyOnly || Current.getAccount().email.equals(object.sender_address)) &&
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 740f0dff..3fc37fea 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -1,4 +1,5 @@
 package TestingSystem;
+import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.rDBObject;
 import Common.Global;
@@ -21,6 +22,7 @@ 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;
@@ -37,6 +39,7 @@ 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;
@@ -311,6 +314,31 @@ 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;
@@ -323,6 +351,15 @@ 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);
diff --git a/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
new file mode 100644
index 00000000..ee113d5b
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/AbortSapforTaskPackage.java
@@ -0,0 +1,28 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
+import Visual_DVM_2021.Passes.TestingSystemPass;
+public class AbortSapforTaskPackage extends TestingSystemPass<SapforTasksPackage> {
+    @Override
+    public String getIconPath() {
+        return "/icons/Ban.PNG";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (Current.Check(Log, Current.SapforTasksPackage)){
+            target = Current.getSapforTasksPackage();
+            return true;
+        };
+        return false;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.AbortSapforTasksPackage, Current.getAccount().email, target.id));
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index b70af673..b425e807 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -4,6 +4,7 @@ public enum PassCode_2021 {
     //-
     ShowAllParallelVariants,
     ShowParallelVariantsCoverage,
+    AbortSapforTaskPackage,
     //-
     DeleteServerSapfor,
     StartSapforTests,
@@ -307,6 +308,8 @@ public enum PassCode_2021 {
         switch (this) {
             case Undefined:
                 return "?";
+            case AbortSapforTaskPackage:
+                return "Прервать пакет задач SAPFOR";
             case ShowAllParallelVariants:
                 return "Отобразить все параллельные варианты";
             case ShowParallelVariantsCoverage: