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

no message

Browse Source
This commit is contained in:
02090095
2023-09-21 20:55:14 +03:00
parent e4131fc071
commit 7cc64ae0d2
45 changed files with 164 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Common/Current.java
View File

@@ -20,9 +20,9 @@ import ProjectData.SapforData.Regions.ParallelRegion;
import Repository.BugReport.BugReport;
import Repository.Subscribes.Subscriber;
import TestingSystem.Configuration.Configuration;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration;
import TestingSystem.Sapfor.SapforTask.SapforTask_2023;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackage_2023;
import SapforTestingSystem.SapforConfiguration.SapforConfiguration;
import SapforTestingSystem.SapforTask.SapforTask_2023;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage_2023;
import TestingSystem.Tasks.TestCompilationTask;
import TestingSystem.Tasks.TestRunTask;
import TestingSystem.TasksPackage.TasksPackage;
@@ -236,7 +236,7 @@ public enum Current {
return (Configuration) get(Current.Configuration);
}
public static SapforConfiguration getSapforConfiguration() {
return (TestingSystem.Sapfor.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
return (SapforTestingSystem.SapforConfiguration.SapforConfiguration) get(Current.SapforConfiguration);
}
//--
public static Test getTest() {
@@ -374,8 +374,8 @@ public enum Current {
public static boolean CheckID(Current name, int id) {
return (get(name) != null) && (((iDBObject) get(name)).id == id);
}
public static TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
return (TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
public static SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand getSapforConfigurationCommand() {
return (SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommand) get(Current.SapforConfigurationCommand);
}
public static boolean HasSapforProfile() {
return get(Current.SapforProfile)!=null;

2
src/Common/Global.java
View File

@@ -382,7 +382,7 @@ public class Global {
}
};
Log.ClearLog();
new PackageModeSupervisor().Start();
new PackageModeSupervisor().Do();
break;
case Undefined:
break;

53
src/Common/ModesSupervisors/PackageModeSupervisor.java
View File

@@ -2,19 +2,20 @@ package Common.ModesSupervisors;
import Common.Global;
import Common.Utils.InterruptThread;
import Common.Utils.Utils;
import TestingSystem.Sapfor.Scenario_json;
import SapforTestingSystem.Json.Scenario_json;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.charset.Charset;
import java.util.Stack;
import java.util.Vector;
public class PackageModeSupervisor {
Thread interruptThread = new InterruptThread(5000, () -> {
System.exit(0);
return null;
});
//--->>
int free_kernels = 4;
int busy_kernels = 0;
int kernels = 4;
//--->>
Scenario_json scenario;
//--->>
@@ -23,21 +24,49 @@ public class PackageModeSupervisor {
File sapfor_drv;
File scenarioFile;
//--->>
public void Start() {
Vector<String> activeTests = new Vector<>();
Stack<String> waitingTests = new Stack<>();
//--->>
public void init() throws Exception {
packageWorkspace = new File(Global.Home);
scenarioFile = new File(packageWorkspace, "scenario.txt");
sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
scenario = Utils.gson.fromJson(packed, Scenario_json.class);
//--->>
for (String test : scenario.tests)
waitingTests.push(test);
}
public boolean isFinished(String test){
return true;
}
//--->>
public void checkActiveTests() throws Exception {
Vector<String> finishedTests = new Vector<>();
for (String test: activeTests){
if (isFinished(test))
finishedTests.add(test);
}
for (String test: finishedTests){
activeTests.remove(test);
}
}
public void startWaitingTests() throws Exception {
}
//--->>
public void Do() {
try {
interruptThread.start();
//--->>
packageWorkspace = new File(Global.Home);
scenarioFile = new File(packageWorkspace, "scenario.txt");
sapfor_drv = new File(packageWorkspace, "SAPFOR_F.exe");
init();
//--->>
String packed = FileUtils.readFileToString(scenarioFile, Charset.defaultCharset());
scenario = Utils.gson.fromJson(packed, Scenario_json.class);
do {
checkActiveTests();
startWaitingTests();
Thread.sleep(1000);
} while (!activeTests.isEmpty() && !waitingTests.isEmpty());
} catch (Exception ex) {
ex.printStackTrace();
}
}
//--->>
public void startTest() {
}
}

8
src/Common/UI/UI.java
View File

@@ -70,10 +70,10 @@ import Repository.Component.UI.ComponentsForm;
import Repository.Subscribes.SubsribersDBTable;
import TestingSystem.Configuration.UI.ConfigurationDBTable;
import TestingSystem.Group.GroupsDBTable;
import TestingSystem.Sapfor.SapforConfiguration.SapforConfigurationDBTable;
import TestingSystem.Sapfor.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import TestingSystem.Sapfor.SapforTask.SapforTasksDBTable;
import TestingSystem.Sapfor.SapforTasksPackage.SapforTasksPackagesDBTable;
import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
import SapforTestingSystem.SapforConfigurationCommand.SapforConfigurationCommandsDBTable;
import SapforTestingSystem.SapforTask.SapforTasksDBTable;
import SapforTestingSystem.SapforTasksPackage.SapforTasksPackagesDBTable;
import TestingSystem.Tasks.TestRunTasksDBTable;
import TestingSystem.TasksPackage.TasksPackageDBTable;
import TestingSystem.Test.TestDBTable;