приведение способа задания ядер к единому, для двм и сапфора.

.idea/workspace.xml

@@ -6,7 +6,22 @@
     </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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.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/MachineKernels/MachineKernels.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/MachineMaxKernels/MachineMaxKernels.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/MachineMaxKernels/MachineMaxKernelsDBTable.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackageDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksPackage/TasksPackageDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditMachineKernels.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartTests.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" />

src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java

@@ -4,6 +4,7 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 public class ConfigurationsMenuBar extends DataMenuBar {
     public ConfigurationsMenuBar() {
         super("конфигурации");
+
         /*
         add(new MenuBarButton() {
             {
@@ -22,7 +23,6 @@ public class ConfigurationsMenuBar extends DataMenuBar {
         });
          */
         addPasses(
-                PassCode_2021.EditMachineKernels,
                 PassCode_2021.StartTests,
                 PassCode_2021.PublishConfiguration,
                 PassCode_2021.CopyConfigurations,

src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackagesDBTable.java

@@ -28,9 +28,9 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
         return new DataSetControlForm(this) {
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(4).setRenderer(RendererDate);
                 columns.get(5).setRenderer(RendererDate);
-                columns.get(6).setRenderer(RendererStatusEnum);
+                columns.get(6).setRenderer(RendererDate);
+                columns.get(7).setRenderer(RendererStatusEnum);
             }
             @Override
             public void ShowCurrentObject() throws Exception {
@@ -50,6 +50,7 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
                 "SAPFOR",
                 "Тесты",
                 "Задач",
+                "Ядер",
                 "Начало",
                 "Изменено",
                 "Статус"
@@ -65,10 +66,12 @@ public class SapforTasksPackagesDBTable extends DBTable<String, SapforTasksPacka
             case 3:
                 return object.tasksCount;
             case 4:
-                return new Date(object.StartDate);
+                return object.kernels;
             case 5:
-                return new Date(object.ChangeDate);
+                return new Date(object.StartDate);
             case 6:
+                return new Date(object.ChangeDate);
+            case 7:
                 return object.state;
             default:
                 return null;

src/TestingSystem/MachineKernels/MachineKernels.java

@@ -1,25 +0,0 @@
-package TestingSystem.MachineKernels;
-import Common.Database.DBObject;
-import com.sun.org.glassfish.gmbal.Description;
-public class MachineKernels extends DBObject {
-    @Description("PRIMARY KEY, UNIQUE")
-    public String URL = "";
-    @Override
-    public Object getPK() {
-        return URL;
-    }
-    public MachineKernels() {
-    }
-    public MachineKernels(String URL_in) {
-        URL = URL_in;
-    }
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        MachineKernels mk = (MachineKernels) src;
-        URL = mk.URL;
-    }
-    public MachineKernels(MachineKernels src) {
-        this.SynchronizeFields(src);
-    }
-}

src/TestingSystem/MachineMaxKernels/MachineMaxKernels.java

@@ -1,22 +0,0 @@
-package TestingSystem.MachineMaxKernels;
-import Common.Database.DBObject;
-import TestingSystem.MachineKernels.MachineKernels;
-import com.sun.org.glassfish.gmbal.Description;
-public class MachineMaxKernels extends MachineKernels {
-    @Description("DEFAULT 4")
-    public int limit = 4;
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        MachineMaxKernels mk = (MachineMaxKernels) src;
-        limit = mk.limit;
-    }
-    public MachineMaxKernels(MachineMaxKernels src) {
-        this.SynchronizeFields(src);
-    }
-    public MachineMaxKernels() {
-    }
-    public MachineMaxKernels(String URL_in) {
-        super(URL_in);
-    }
-}

src/TestingSystem/MachineMaxKernels/MachineMaxKernelsDBTable.java

@@ -1,7 +0,0 @@
-package TestingSystem.MachineMaxKernels;
-import Common.Database.DBTable;
-public class MachineMaxKernelsDBTable extends DBTable<String, MachineMaxKernels> {
-    public MachineMaxKernelsDBTable() {
-        super(String.class, MachineMaxKernels.class);
-    }
-}

src/TestingSystem/TasksPackage/TasksPackage.java

@@ -3,6 +3,7 @@ import Common.Database.DBObject;
 import Common.Database.nDBObject;
 import GlobalData.Machine.MachineType;
 import TestingSystem.Tasks.TestCompilationTask;
+import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.LinkedHashMap;
 import java.util.Vector;
@@ -11,7 +12,6 @@ public class TasksPackage extends nDBObject {
     public String summary = "";
     //---
     public String dvm_version = "?";
-    public String sapfor_version = "?";
     public String dvm_drv = "";
     //---
     public String machine_name = "";
@@ -30,6 +30,9 @@ public class TasksPackage extends nDBObject {
     public long StartDate = 0; //дата начала выполнения
     public long ChangeDate = 0;//дата окончания выполнения
     //-
+    @Description("DEFAULT 1")
+    public int kernels = 1;
+    //-
     public TasksPackageState state = TasksPackageState.Queued;
     //--
     //нужно только для публикации задач.
@@ -42,7 +45,6 @@ public class TasksPackage extends nDBObject {
         summary = tasksPackage.summary;
         dvm_drv = tasksPackage.dvm_drv;
         dvm_version = tasksPackage.dvm_version;
-        sapfor_version = tasksPackage.sapfor_version;
         machine_name = tasksPackage.machine_name;
         machine_address = tasksPackage.machine_address;
         machine_port = tasksPackage.machine_port;
@@ -57,6 +59,7 @@ public class TasksPackage extends nDBObject {
         StartDate = tasksPackage.StartDate;
         ChangeDate = tasksPackage.ChangeDate;
         sorted_tasks = new LinkedHashMap<>();
+        kernels = tasksPackage.kernels;
         state = tasksPackage.state;
         //-
         for (String group_id : tasksPackage.sorted_tasks.keySet()) {

src/TestingSystem/TasksPackage/TasksPackageDBTable.java

@@ -3,11 +3,8 @@ import Common.Current;
 import Common.Database.*;
 import Common.UI.DataSetControlForm;
 import Common.UI.UI;
-import Common.Utils.Utils;
 import TestingSystem.Tasks.TestRunTask;
-import TestingSystem.TestingServer;
 
-import javax.swing.*;
 import java.util.Date;
 import java.util.LinkedHashMap;
 
@@ -39,9 +36,9 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
             }
             @Override
             protected void AdditionalInitColumns() {
-                columns.get(6).setRenderer(RendererDate);
                 columns.get(7).setRenderer(RendererDate);
-                columns.get(8).setRenderer(RendererStatusEnum);
+                columns.get(8).setRenderer(RendererDate);
+                columns.get(9).setRenderer(RendererStatusEnum);
             }
             @Override
             public void ShowCurrentObject() throws Exception {
@@ -63,6 +60,8 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
                 "Пользователь",
                 "DVM",
                 "Задач",
+
+                "Ядер",
                 "Начало",
                 "Изменено",
                 "Статус"
@@ -80,10 +79,12 @@ public class TasksPackageDBTable extends DBTable<String, TasksPackage> {
             case 5:
                 return object.runTasksCount;
             case 6:
-                return new Date(object.StartDate);
+                return object.kernels;
             case 7:
-                return new Date(object.ChangeDate);
+                return new Date(object.StartDate);
             case 8:
+                return new Date(object.ChangeDate);
+            case 9:
                 return object.state;
             default:
                 return null;

src/TestingSystem/TestingPlanner.java

@@ -8,7 +8,6 @@ import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import SapforTestingSystem.SapforTasksPackageSupervisor.SapforTasksPackageSupervisor;
-import TestingSystem.MachineMaxKernels.MachineMaxKernels;
 import TestingSystem.Tasks.TestCompilationTask;
 import TestingSystem.Tasks.TestTask;
 import TestingSystem.TasksPackage.TasksPackage;
@@ -36,7 +35,6 @@ public class TestingPlanner {
     protected Machine machine = null;
     protected User user = null;
     public LinkedHashMap<Long, TestCompilationTask> packageTasks = new LinkedHashMap<>();
-    public MachineMaxKernels maxKernels = null;
     //----------
     SapforTasksPackage sapforTasksPackage = null;
     //----------
@@ -170,8 +168,6 @@ public class TestingPlanner {
                             new User(tasksPackage.user_name, tasksPackage.user_password, tasksPackage.user_workspace));
                 machine = machines.get(machine_url);
                 //-->>
-                maxKernels = (MachineMaxKernels) ServerCommand(ServerCode.GetObjectCopyByPK, "", new Pair<>(MachineMaxKernels.class, machine_url));
-                //-->>
                 user = users.get(tasksPackage.user_name);
                 if (CheckConnection(machine, user)) {
                     try {

src/TestingSystem/TestsDatabase.java

@@ -6,7 +6,6 @@ import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand
 import SapforTestingSystem.ServerSapfor.ServerSapforsDBTable;
 import TestingSystem.Configuration.UI.ConfigurationDBTable;
 import TestingSystem.Group.GroupsDBTable;
-import TestingSystem.MachineMaxKernels.MachineMaxKernelsDBTable;
 import TestingSystem.TSetting.TSetting;
 import TestingSystem.TSetting.TSettingsDBTable;
 import TestingSystem.Test.TestDBTable;
@@ -16,7 +15,6 @@ public class TestsDatabase extends SQLiteDatabase {
     public ConfigurationDBTable configurations;
     public TestDBTable tests;
     public GroupsDBTable groups;
-    public MachineMaxKernelsDBTable machinesMaxKernels;
     public TSettingsDBTable settings;
     //--
     public SapforConfigurationDBTable sapforConfigurations;
@@ -31,7 +29,6 @@ public class TestsDatabase extends SQLiteDatabase {
         addTable(configurations = new ConfigurationDBTable());
         addTable(groups = new GroupsDBTable());
         addTable(tests = new TestDBTable());
-        addTable(machinesMaxKernels = new MachineMaxKernelsDBTable());
         addTable(settings = new TSettingsDBTable());
         //-
         addTable(sapforConfigurations = new SapforConfigurationDBTable());

src/TestingSystem/TestsSupervisor_2022/TestsSupervisor_2022.java

@@ -117,8 +117,8 @@ public class TestsSupervisor_2022 {
         for (TestCompilationTask compilationTask : planner.packageTasks.values()) {
             compilationLines.addAll(compilationTask.pack(1));
             for (TestRunTask runTask : compilationTask.runTasks) {
-                int rt_kernels = (runTask.test_type == TestType.Performance) ? planner.maxKernels.limit :
+                int rt_kernels = (runTask.test_type == TestType.Performance) ? tasksPackage.kernels :
-                        Math.min(Utils.getMatrixProcessors(runTask.matrix), planner.maxKernels.limit);
+                        Math.min(Utils.getMatrixProcessors(runTask.matrix), tasksPackage.kernels);
                 runLines.addAll(runTask.pack(rt_kernels));
             }
         }
@@ -136,7 +136,7 @@ public class TestsSupervisor_2022 {
                         Utils.DQuotes(planner.getPlanner()),
                         Utils.DQuotes(tasksPackage.user_workspace),
                         Utils.DQuotes(packageRemoteWorkspace.full_name),
-                        Utils.DQuotes(planner.maxKernels.limit),
+                        Utils.DQuotes(tasksPackage.kernels),
                         Utils.DQuotes(tasksPackage.dvm_drv),
                         "&"
                 );

src/Visual_DVM_2021/Passes/All/EditMachineKernels.java

@@ -1,42 +0,0 @@
-package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Global;
-import Common.UI.Windows.Dialog.SliderNumberForm;
-import GlobalData.Machine.Machine;
-import Repository.Server.ServerCode;
-import Repository.Server.ServerExchangeUnit_2021;
-import TestingSystem.MachineMaxKernels.MachineMaxKernels;
-import Visual_DVM_2021.Passes.TestingSystemPass;
-public class EditMachineKernels extends TestingSystemPass<MachineMaxKernels> {
-    @Override
-    public String getIconPath() {
-        return "/icons/Machine.png";
-    }
-    @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
-    protected boolean canStart(Object... args) throws Exception {
-        if (Current.Check(Log, Current.Machine)) {
-            Machine machine = Current.getMachine();
-            String url = machine.getURL();
-            if (server.db.machinesMaxKernels.containsKey(url)) target = server.db.machinesMaxKernels.get(url);
-            else {
-                target = new MachineMaxKernels(url);
-                server.db.Insert(target);
-            }
-            SliderNumberForm fff = new SliderNumberForm();
-            if (fff.ShowDialog(url, target.limit, 1, 16)) {
-                target.limit = fff.Result;
-                return true;
-            }
-        }
-        return false;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.EditObject, "", target));
-        Global.testingServer.db.Update(target);
-    }
-}

src/Visual_DVM_2021/Passes/All/StartTests.java

@@ -136,7 +136,7 @@ public class StartTests extends TestingSystemPass<TasksPackage> {
         target.user_workspace = Current.getUser().workspace;
         target.dvm_drv = Current.getCompiler().call_command;
         target.dvm_version = Current.getCompiler().getVersionInfo();
-        target.sapfor_version = String.valueOf(Current.getSapfor().version);
+        target.kernels = TestingServer.kernels;
         Vector<TestCompilationTask> tasks = new Vector<>();
         //1, Проверяем выбраны ли конфиги.
         if (server.db.configurations.getCheckedCount() == 0) {

src/Visual_DVM_2021/Passes/PassCode_2021.java

@@ -240,7 +240,6 @@ public enum PassCode_2021 {
     Precompilation,
     GCOV,
     ConvertCorrectnessTests,
-    EditMachineKernels,
     ShowCompilerVersion,
     //-
     PickCompilerEnvironmentsForTesting,
@@ -460,8 +459,6 @@ public enum PassCode_2021 {
                 return "Выбрать набор переменных окружения";
             case ShowCompilerVersion:
                 return "Отобразить версию текущего компилятора";
-            case EditMachineKernels:
-                return "Изменить число ядер для тестирования текущей машины";
             case ConvertCorrectnessTests:
                 return "Конвертировать тесты из репозитория";
             case SPF_GetArrayDistributionOnlyRegions: