M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

промежуточный. прописал для планировщиков общий класс-предок

Browse Source
This commit is contained in:
02090095
2023-12-14 02:30:56 +03:00
parent 749c0397e6
commit c07b72eb5d
18 changed files with 669 additions and 4416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/TestingSystem/Common/TestingServer.java
View File

@@ -22,6 +22,7 @@ import TestingSystem.Common.TasksPackageToKill.TasksPackageToKill;
import TestingSystem.Common.Test.Test;
import TestingSystem.Common.Test.TestType;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.DVMTestingPlanner;
import TestingSystem.DVM.Tasks.TestCompilationTask;
import TestingSystem.DVM.Tasks.TestRunTask;
import TestingSystem.DVM.Tasks.TestTask;
@@ -102,9 +103,13 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
@Override
protected void startAdditionalThreads() {
testingThread.start();
testingThread_2023.start();
}
protected TestingPlanner testingPlanner = new TestingPlanner();
protected Thread testingThread = new Thread(() -> testingPlanner.Perform());
protected TestingPlanner_OLD testingPlannerOLD = new TestingPlanner_OLD();
protected Thread testingThread = new Thread(() -> testingPlannerOLD.Perform());
//---
protected DVMTestingPlanner DVMTestingPlanner_ = new DVMTestingPlanner();
protected Thread testingThread_2023 = new Thread(() -> DVMTestingPlanner_.Perform());
//------>>>
public static Timer checkTimer = null;
public static void TimerOn() {
@@ -369,6 +374,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
response = new ServerExchangeUnit_2021(ServerCode.OK);
ActualizeSAPFORPackages();
break;
case GetFirstActiveDVMPackage:
Print("Получить первый активный пакет задач DVM");
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = db.getFirstActiveDVMPackage();
break;
default:
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
}
@@ -529,13 +539,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
} else if (object instanceof SapforTasksPackage) {
SapforTasksPackage sapforTasksPackage = (SapforTasksPackage) object;
sapforTasksPackage.id = db.IncKey(SettingName.SAPFORPackageId);
}else if (object instanceof DVMPackage){
DVMPackage dvmPackage = (DVMPackage) object;
//--
dvmPackage.state = TasksPackageState.Queued;
Utils.CheckAndCleanDirectory(dvmPackage.getLocalWorkspace());
//--
dvmPackage.saveJson();
}
}
@Override
@@ -593,6 +596,14 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
+ "\nТест будет удален"
);
}
}else if (object instanceof DVMPackage) {
DVMPackage dvmPackage = (DVMPackage) object;
//--
dvmPackage.state = TasksPackageState.Queued;
Utils.CheckAndCleanDirectory(dvmPackage.getLocalWorkspace());
//--
dvmPackage.saveJson();
dvmPackage.package_json = null; // объект больше не нужен.
}
}
@Override