From 3373d2e704725980c9ffe95f4c6f0aeeba5aaaeb Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 30 Sep 2023 01:58:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B2?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BD=D0=BE=D0=BC=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B6=D0=B8=D0=BC=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D0=B2=20=D1=82=D0=BE=D0=BC=20=D1=87=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B5=20=D0=B8=20=D0=BD=D0=B0=20=D0=BF=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=BB=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8F=D1=85.=20=D0=BE=D1=81=D1=82=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=BE=D1=81=D1=8C=20=D0=B0=D0=BD=D0=B0=D0=BB=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C,=20=D0=B8?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=BD=D1=83=D0=BA=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                           | 3 +++
 properties                                                    | 4 +++-
 src/Common/GlobalProperties.java                              | 4 ++++
 .../SapforTestingPlaner/SapforTestingPlanner.java             | 2 +-
 src/Visual_DVM_2021/Passes/All/StartSapforTests.java          | 2 ++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7fabba4f..928c43a8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,6 +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/Common/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/GlobalProperties.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSapforTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 015e8034..ba2a8569 100644
--- a/properties
+++ b/properties
@@ -25,5 +25,7 @@
   "InstructionPath": "",
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
-  "SapforTaskMaxId": 4212
+  "SapforTaskMaxId": 4212,
+  "threadsNum": 1,
+  "threadsTimeout": 2000
 }
\ No newline at end of file
diff --git a/src/Common/GlobalProperties.java b/src/Common/GlobalProperties.java
index f16ecba0..9ba6a757 100644
--- a/src/Common/GlobalProperties.java
+++ b/src/Common/GlobalProperties.java
@@ -66,6 +66,10 @@ public class GlobalProperties extends Properties {
     public int ComponentsBackUpsCount=10;
     @Expose
     public long SapforTaskMaxId = 0; //вероятно, временно. когда перейдем на удаленную машину.
+    @Expose
+    public int threadsNum=1;//для пакетного режима.
+    @Expose
+    public int threadsTimeout = 2000; //для пакетного режима.
     //-
     @Override
     public String getFieldDescription(String fieldName) {
diff --git a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
index 5f5b621b..b2794b4c 100644
--- a/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
+++ b/src/SapforTestingSystem/SapforTestingPlaner/SapforTestingPlanner.java
@@ -10,7 +10,7 @@ import java.io.File;
 import java.nio.file.Paths;
 public class SapforTestingPlanner extends ThreadsPlanner {
     public SapforTestingPlanner() throws Exception {
-        super(2000, 1);
+        super(Global.properties.threadsTimeout, Global.properties.threadsNum);
         SapforScenario_json scenario_json = (SapforScenario_json) Utils.jsonFromFile(new File(Global.Home, "scenario.txt"), SapforScenario_json.class);
         //формирование списка задач.
         for (SapforPackage_json sapforPackage_json : scenario_json.packages) {
diff --git a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
index 5783a509..047c56c7 100644
--- a/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
+++ b/src/Visual_DVM_2021/Passes/All/StartSapforTests.java
@@ -225,6 +225,8 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
         ShowMessage2("Создание настроек");
         GlobalProperties properties = new GlobalProperties();
         properties.Mode = Current.Mode.Scenario;
+        properties.threadsNum = 1;
+        properties.threadsTimeout = 5000;
         //----
         Utils.jsonToFile(properties, new File(target.workspace, "properties"));
         //----