diff --git a/properties b/properties index ba2a8569..8465a67a 100644 --- a/properties +++ b/properties @@ -24,8 +24,5 @@ "Visualizer_2Path": "C:\\Users\\misha\\Documents", "InstructionPath": "", "PerformanceAnalyzerPath": "", - "ComponentsBackUpsCount": 10, - "SapforTaskMaxId": 4212, - "threadsNum": 1, - "threadsTimeout": 2000 + "ComponentsBackUpsCount": 10 } \ No newline at end of file diff --git a/src/Common/GlobalProperties.java b/src/Common/GlobalProperties.java index 9ba6a757..491e708f 100644 --- a/src/Common/GlobalProperties.java +++ b/src/Common/GlobalProperties.java @@ -64,12 +64,6 @@ public class GlobalProperties extends Properties { public String PerformanceAnalyzerPath = ""; @Expose 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/GlobalData/GlobalDatabase.java b/src/GlobalData/GlobalDatabase.java index f30ba3fc..9d86a8bf 100644 --- a/src/GlobalData/GlobalDatabase.java +++ b/src/GlobalData/GlobalDatabase.java @@ -124,12 +124,6 @@ public class GlobalDatabase extends SQLiteDatabase { Global.Log.PrintException(ex); } } - public long IncSapforMaxTaskId() { - long res = Global.properties.SapforTaskMaxId; - Global.properties.SapforTaskMaxId++; - Global.properties.Update(); - return res; - } /* public DataSet getSapforPackagesMasterDataSet(SapforConfigurationTasksSet package_in) throws Exception { DataSet res = new DataSet(String.class, SapforTaskResult.class) { diff --git a/src/SapforTestingSystem/Json/SapforTasksPackage_json.java b/src/SapforTestingSystem/Json/SapforTasksPackage_json.java index f8ab85aa..663deb41 100644 --- a/src/SapforTestingSystem/Json/SapforTasksPackage_json.java +++ b/src/SapforTestingSystem/Json/SapforTasksPackage_json.java @@ -4,6 +4,8 @@ import com.google.gson.annotations.Expose; import java.util.List; import java.util.Vector; public class SapforTasksPackage_json { + @Expose + public int kernels = 1; @Expose public String sapfor_drv = ""; //файл с сапфором. Имя уникально для сценария. @Expose diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java index 3ef3146e..5a9464be 100644 --- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java +++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java @@ -17,7 +17,7 @@ public class SapforTasksPackage extends nDBObject { public long StartDate = 0; //дата начала выполнения public long ChangeDate = 0;//дата окончания выполнения //- - public int kernels=1; //количество потоков.д + public int kernels=1; //количество потоков. @Description("DEFAULT 'Queued'") public TasksPackageState state = TasksPackageState.Queued; // допустимые состояния @@ -37,6 +37,7 @@ public class SapforTasksPackage extends nDBObject { tasksCount = p.tasksCount; StartDate = p.StartDate; ChangeDate = p.ChangeDate; + kernels = p.kernels; state = p.state; } } diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java index 1955a2b3..ea701209 100644 --- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java +++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java @@ -16,11 +16,12 @@ public class SapforTasksPackageSupervisor extends ThreadsPlanner { SapforTasksPackage_json package_json = null; SapforTasksResults_json results_json = new SapforTasksResults_json(); public SapforTasksPackageSupervisor() throws Exception { - super(Global.properties.threadsTimeout, Global.properties.threadsNum); + super(2000); package_json = (SapforTasksPackage_json) Utils.jsonFromFile(new File(Global.Home, "package_json"), SapforTasksPackage_json.class); results_json.StartDate = new Date().getTime(); //формирование списка задач. File sapfor_drv = new File(Global.Home, package_json.sapfor_drv); + setMaxKernels(package_json.kernels); for (SapforConfiguration_json sapforConfiguration_json : package_json.configurations) { for (String testName : package_json.tests) { //--- чтобы было можно на нее сослаться после выполнения всех нитей. diff --git a/src/SapforTestingSystem/SapforTasksPackage_info.java b/src/SapforTestingSystem/SapforTasksPackage_info.java index 80da4446..07c02e4a 100644 --- a/src/SapforTestingSystem/SapforTasksPackage_info.java +++ b/src/SapforTestingSystem/SapforTasksPackage_info.java @@ -11,6 +11,8 @@ public class SapforTasksPackage_info implements Serializable { @Expose public int sapforId = Constants.Nan; //файл с сапфором @Expose + public int kernels = 1; + @Expose public List testsIds = new Vector<>(); @Expose public List configurationsIds = new Vector<>(); diff --git a/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java b/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java index 035cf352..1bc5cc93 100644 --- a/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java +++ b/src/SapforTestingSystem/ThreadsPlanner/ThreadsPlanner.java @@ -24,8 +24,10 @@ public abstract class ThreadsPlanner { protected Vector activeThreads = new Vector<>(); protected Vector waitingThreads = new Vector<>(); //-- - public ThreadsPlanner(int wait_ms_in, int maxKernels_in) { + public ThreadsPlanner(int wait_ms_in) { wait_ms = wait_ms_in; + } + public void setMaxKernels(int maxKernels_in){ maxKernels = maxKernels_in; kernels = maxKernels; } diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java index 35e228b8..0ad13d8b 100644 --- a/src/TestingSystem/TestingServer.java +++ b/src/TestingSystem/TestingServer.java @@ -324,6 +324,7 @@ public class TestingServer extends RepositoryServer { SetCurrentAccountDB(sapforTasksPackage_info.email); //-- SapforTasksPackage_json package_json = new SapforTasksPackage_json(); + package_json.kernels = sapforTasksPackage_info.kernels; for (String test_id : sapforTasksPackage_info.testsIds) package_json.tests.add(db.tests.get(test_id).description); //создание объекта набора задач. для бд. @@ -369,8 +370,6 @@ public class TestingServer extends RepositoryServer { //создание настроек GlobalProperties properties = new GlobalProperties(); properties.Mode = Current.Mode.Package; - properties.threadsNum = Global.properties.threadsNum; //брать из настроек сервера же. - properties.threadsTimeout = Global.properties.threadsTimeout; Utils.jsonToFile(properties, new File(sapforTasksPackage.workspace, "properties")); //создание инструкции File package_json_file = new File(sapforTasksPackage.workspace, "package_json"); @@ -382,6 +381,7 @@ public class TestingServer extends RepositoryServer { sapforTasksPackage.sapfor_build_date = sapfor.buildDate; sapforTasksPackage.testsNames = String.join(";", package_json.tests); sapforTasksPackage.StartDate = new Date().getTime(); + sapforTasksPackage.kernels= sapforTasksPackage_info.kernels; sapforTasksPackage.state = TasksPackageState.Queued; account_db.Update(sapforTasksPackage); }