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

fix.додедал этап прерывания компиляции

Browse Source
This commit is contained in:
02090095
2025-03-14 10:35:24 +03:00
parent 04cf5c1552
commit 9f4eb9d88e
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml generated
View File

@@ -8,12 +8,9 @@
<component name="ChangeListManager"> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/files/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Supervisor.h" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/files/Supervisor.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Supervisor.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/files/version.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/version.h" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

2
src/_VisualDVM/Constants.java
View File

@@ -4,7 +4,7 @@ import Common.Utils.Vector_;
import java.util.Vector; import java.util.Vector;
public class Constants { public class Constants {
public static final int version = 1209; public static final int version = 1209;
public static final int planner_version = 20; public static final int planner_version = 21;
public static final int testingMaxKernels = 64; public static final int testingMaxKernels = 64;
//-- //--
public static final String ApplicationFileName = "VisualSapfor.jar"; public static final String ApplicationFileName = "VisualSapfor.jar";

1
src/_VisualDVM/TestingSystem/Common/TestingPlanner.java
View File

@@ -157,7 +157,6 @@ public abstract class TestingPlanner<P extends TestingPackage> extends TestingCl
if (ptk_id != CommonConstants.Nan) { if (ptk_id != CommonConstants.Nan) {
Print("package " + testingPackage.id + " NEEDS TO KILL"); Print("package " + testingPackage.id + " NEEDS TO KILL");
Kill(); Kill();
UpdatePackageState(TasksPackageState.Aborted);
ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id)); ServerCommand(ServerCode.DeleteObjectByPK, new Pair(TestingPackageToKill.class, ptk_id));
} else if (checkIfPaused()) { } else if (checkIfPaused()) {
UpdatePackageState(TasksPackageState.Paused); UpdatePackageState(TasksPackageState.Paused);

1
src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java
View File

@@ -219,6 +219,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
Process killer = Runtime.getRuntime().exec(kill_command); Process killer = Runtime.getRuntime().exec(kill_command);
killer.waitFor(); killer.waitFor();
Print("done!"); Print("done!");
UpdatePackageState(TasksPackageState.Aborted);
} }
//-- //--
@Override @Override

14
src/files/Supervisor.h
View File

@@ -257,20 +257,24 @@ public:
if (!killed) { if (!killed) {
for (auto& task : taskList) for (auto& task : taskList)
task->copyResults(pathRes); task->copyResults(pathRes);
}
changeState(); changeState();
String outFile(pathRes + "/" + getStatePrefix() + "Info.txt"); String outFile(pathRes + "/" + getStatePrefix() + "Info.txt");
File tmp(outFile, String(buf.c_str())); File tmp(outFile, String(buf.c_str()));
//скопировать в результаты лог планировщика. }
if (killed){ else {
//всегда финальное состояние.
saveState("RunningEnd");
ToLog("quit application"); ToLog("quit application");
std::exit(0); std::exit(0);
} }
} }
void saveState() { void saveState(const String& state_text){
String stateFile = packageWorkspace + "/state/" + getStatePrefix() + printState(); String stateFile = packageWorkspace + "/state/" + state_text;
File tmp(stateFile, Utils::getDate()); File tmp(stateFile, Utils::getDate());
} }
void saveState() {
saveState(getStatePrefix() + printState());
}
void saveProgress(long long persentDone) { void saveProgress(long long persentDone) {
FILE* f = fopen("progress", "w"); FILE* f = fopen("progress", "w");
if (f) { if (f) {

2
src/files/version.h
View File

@@ -1 +1 @@
20 21