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
2024-10-14 15:19:13 +03:00
parent 8eef367bd4
commit 5e09fb44ea
634 changed files with 3751 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java
View File

@@ -4,14 +4,15 @@ import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
//конфгурация тестирования ДВМ
public class DVMConfiguration extends Configuration {
public int c_maxtime = 40;
public DVMConfiguration(DVMConfiguration src) {
this.SynchronizeFields(src);
}
public DVMConfiguration() {
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
DVMConfiguration c = (DVMConfiguration) src;
c_maxtime=c.c_maxtime;
c_maxtime = c.c_maxtime;
}
public DVMConfiguration(DVMConfiguration src){
this.SynchronizeFields(src);
}
public DVMConfiguration(){}
}

4
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Tables.TableRenderers;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI.ConfigurationFields;
public class DVMConfigurationDBTable extends iDBTable<DVMConfiguration> {
public DVMConfigurationDBTable() {

2
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationsMenuBar.java
View File

@@ -6,12 +6,10 @@ public class DVMConfigurationsMenuBar extends DataMenuBar {
super("конфигурации");
addPasses(
PassCode.PublishConfiguration,
PassCode.EditConfiguration,
PassCode.ShowCurrentDVMConfigurationTests,
PassCode.SaveCurrentDVMConfiguration,
PassCode.DeleteConfiguration,
PassCode.StartSelectedDVMConfigurations
);
}

22
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java
View File

@@ -1,7 +1,7 @@
package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
import _VisualDVM.Constants;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Constants;
import javax.swing.*;
import java.awt.*;
@@ -9,18 +9,10 @@ public class ConfigurationFields implements DialogFields {
public JTextField tfName;
public JSpinner sCompilationMaxtime;
public JSpinner sRunMaxtime;
public JSpinner sKernels;
//-
private JPanel content;
public JSpinner sKernels;
@Override
public Component getContent() {
return content;
}
private void createUIComponents() {
// TODO: place custom component creation code here
tfName = new StyledTextField();
}
public ConfigurationFields(){
public ConfigurationFields() {
sCompilationMaxtime.setModel(new SpinnerNumberModel(40,
5, 3600, 1
));
@@ -31,4 +23,12 @@ public class ConfigurationFields implements DialogFields {
Constants.testingMaxKernels,
1));
}
@Override
public Component getContent() {
return content;
}
private void createUIComponents() {
// TODO: place custom component creation code here
tfName = new StyledTextField();
}
}

14
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java
View File

@@ -1,15 +1,14 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.CommonConstants;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import _VisualDVM.Global;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.GlobalData.Account.Account;
import _VisualDVM.GlobalData.Compiler.Compiler;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.ServerObjectsCache.DVMConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -78,6 +77,10 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
package_json = new DVMPackage_json(compilationTasks);
saveConfigurationsAsJson(configurations);
}
public DVMPackage(DVMPackage p) {
super(p);
this.SynchronizeFields(p);
}
@Override
public Class getJsonClass() {
return DVMPackage_json.class;
@@ -86,10 +89,6 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
public File getHomeDirectory() {
return Global.DVMPackagesDirectory;
}
public DVMPackage(DVMPackage p) {
super(p);
this.SynchronizeFields(p);
}
//---
@Override
public void SynchronizeFields(DBObject src) {
@@ -115,7 +114,6 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
}
@Override
public void checkFinishState() throws Exception {
}
}

11
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackageDBTable.java
View File

@@ -1,12 +1,12 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import _VisualDVM.Current;
import Common.Database.Tables.iDBTable;
import _VisualDVM.Global;
import Common.Visual.DataSetControlForm;
import _VisualDVM.Visual.UI;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Visual.UI;
import java.util.Comparator;
import java.util.Date;
@@ -40,7 +40,7 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
@Override
protected void AdditionalInitColumns() {
columns.get(6).setRenderer(RendererMultiline);
// columns.get(7).setRenderer(RendererMultiline);
// columns.get(7).setRenderer(RendererMultiline);
columns.get(9).setRenderer(RendererProgress);
columns.get(10).setRenderer(RendererDate);
columns.get(11).setRenderer(RendererDate);
@@ -64,7 +64,6 @@ public class DVMPackageDBTable extends iDBTable<DVMPackage> {
public void MouseAction2() throws Exception {
Global.mainModule.getPass(PassCode.DownloadDVMPackage).Do();
}
};
}
@Override

9
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage_json.java
View File

@@ -11,11 +11,9 @@ public class DVMPackage_json implements Serializable {
public int max_task_id = 0;
@Expose
public List<DVMCompilationTask> compilationTasks = new Vector<>();
public int getMaxTaskId() {
return max_task_id++;
public DVMPackage_json() {
}
public DVMPackage_json(){}
public DVMPackage_json(List<DVMCompilationTask> tasks){
public DVMPackage_json(List<DVMCompilationTask> tasks) {
for (DVMCompilationTask compilationTask : tasks) {
compilationTask.id = getMaxTaskId();
//-
@@ -26,4 +24,7 @@ public class DVMPackage_json implements Serializable {
}
compilationTasks.addAll(tasks);
}
public int getMaxTaskId() {
return max_task_id++;
}
}

6
src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.TestingSystem.DVM.DVMPackage;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Menus.DataMenuBar;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
@@ -11,7 +11,7 @@ public class DVMPackagesBar extends DataMenuBar {
super("пакеты задач DVM");
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.AbortDVMPackage );
addPasses(PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.ExportDVMPackageToExcel,

31
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java
View File

@@ -7,40 +7,41 @@ import com.sun.org.glassfish.gmbal.Description;
import java.util.Vector;
public class DVMSettings extends Settings {
//todo.хранить флаги и окружение в json чтобы можно было в форме их видеть.
public String environments="";
public String environments = "";
@Description("DEFAULT 0")
public int Is_DVM_STAT= 0; //флаг вмест usr par, которые не использовались.
// public String usr_par = "";
public int Is_DVM_STAT = 0; //флаг вмест usr par, которые не использовались.
// public String usr_par = "";
//---
public int cube = 0; //
public int max_proc_count = 4;
public int min_dim_proc_count = 1;
public int max_dim_proc_count = 4;
//
public DVMSettings(){}
public DVMSettings(DVMSettings src){
public DVMSettings() {
}
public DVMSettings(DVMSettings src) {
this.SynchronizeFields(src);
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
DVMSettings c = (DVMSettings) src;
environments=c.environments;
environments = c.environments;
Is_DVM_STAT = c.Is_DVM_STAT;
// usr_par=c.usr_par;
// usr_par=c.usr_par;
//-
cube= c.cube;
max_proc_count=c.max_proc_count;
min_dim_proc_count=c.min_dim_proc_count;
max_dim_proc_count=c.max_dim_proc_count;
cube = c.cube;
max_proc_count = c.max_proc_count;
min_dim_proc_count = c.min_dim_proc_count;
max_dim_proc_count = c.max_dim_proc_count;
}
public String printUsrPar(){
return "Is_DVM_STAT="+Is_DVM_STAT;
public String printUsrPar() {
return "Is_DVM_STAT=" + Is_DVM_STAT;
}
public Vector<String> getMatrixes(int testDim) {
Vector<Vector<Integer>> res_ = new Vector<>();
Vector<String> res = new Vector<>();
if ((max_proc_count==0) || (min_dim_proc_count == 0 && max_dim_proc_count == 0)) {
if ((max_proc_count == 0) || (min_dim_proc_count == 0 && max_dim_proc_count == 0)) {
res.add("");
} else {
if (testDim > 0) {
@@ -81,7 +82,7 @@ public class DVMSettings extends Settings {
return res;
}
public String getParamsText() {
return "Is_DVM_STAT="+Is_DVM_STAT;
return "Is_DVM_STAT=" + Is_DVM_STAT;
}
}

6
src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings;
import _VisualDVM.Current;
import Common.Database.Objects.DBObject;
import Common.Database.Tables.iDBTable;
import Common.Visual.DataSetControlForm;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.TestingSystem.DVM.DVMSettings.UI.DVMSettingsFields;
public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
@@ -117,7 +117,7 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
fields.cbCube.setSelected(Result.cube == 1);
//-
fields.sMaxProc.setValue(Result.max_proc_count);
fields.cbDvmStat.setSelected(Result.Is_DVM_STAT!=0);
fields.cbDvmStat.setSelected(Result.Is_DVM_STAT != 0);
}
@Override
public void ProcessResult() {
@@ -128,7 +128,7 @@ public class DVMSettingsDBTable extends iDBTable<DVMSettings> {
Result.max_proc_count = (int) fields.sMaxProc.getValue();
Result.flags = fields.tfFlags.getText();
Result.environments = fields.tfEnvironments.getText();
Result.Is_DVM_STAT = fields.cbDvmStat.isSelected()?1:0;
Result.Is_DVM_STAT = fields.cbDvmStat.isSelected() ? 1 : 0;
}
@Override
public void SetReadonly() {

34
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java
View File

@@ -1,16 +1,15 @@
package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Passes.Pass;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.Passes.PassCode;
import Common.Passes.Pass;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class DVMSettingsFields implements DialogFields {
private JPanel content;
public JTextField tfName;
public JSpinner sMinDimProc;
public JSpinner sMaxDimProc;
@@ -18,38 +17,31 @@ public class DVMSettingsFields implements DialogFields {
public JCheckBox cbCube;
public JTextField tfFlags;
public JTextField tfEnvironments;
public JCheckBox cbDvmStat;
private JPanel content;
private JButton bAddFlags;
private JButton bAddEnvironments;
private JButton bDeleteFlags;
private JButton bDeleteEnvironment;
public JCheckBox cbDvmStat;
@Override
public Component getContent() {
return content;
}
private void createUIComponents() {
// TODO: place custom component creation code here
tfName = new StyledTextField();
}
public DVMSettingsFields(){
public DVMSettingsFields() {
sMinDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
sMaxDimProc.setModel(new SpinnerNumberModel(1, 0, 128, 1));
sMaxProc.setModel(new SpinnerNumberModel(0, 0, 128, 1));
bAddFlags.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerOptions);
if (pass.Do(Global.mainModule.getCompiler())) {
tfFlags.setText((String)pass.target);
tfFlags.setText((String) pass.target);
}
}
});
bAddEnvironments.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
Pass pass = Global.mainModule.getPass(PassCode.PickCompilerEnvironmentsForTesting);
if (pass.Do(Global.mainModule.getCompiler()))
tfEnvironments.setText((String)pass.target);
tfEnvironments.setText((String) pass.target);
}
});
bDeleteFlags.addActionListener(new ActionListener() {
@@ -65,4 +57,12 @@ public class DVMSettingsFields implements DialogFields {
}
});
}
@Override
public Component getContent() {
return content;
}
private void createUIComponents() {
// TODO: place custom component creation code here
tfName = new StyledTextField();
}
}

59
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java
View File

@@ -13,38 +13,10 @@ public class DVMCompilationTask extends DVMTask {
public List<DVMRunTask> runTasks = new Vector<>();
//-
public DVMCompilationTask() {
}
@Override
public Vector<String> pack(Object arg) {
Vector<String> res = new Vector<>();
res.add(String.valueOf(id)); //1
res.add(String.valueOf(maxtime)); //2
res.add(String.valueOf(test_id)); //3
res.add(arg.toString().replace("\n", "|")); //4
return res;
}
//--
public static String checkFlags(String flags_in) {
if (!flags_in.contains("-shared-dvm")) {
if (flags_in.isEmpty())
return "-shared-dvm";
else return flags_in + " -shared-dvm";
} else
return flags_in;
}
public static String checkEnvironments(String environmentsSet_in) {
if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
if (environmentsSet_in.isEmpty())
return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
else
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
} else
return environmentsSet_in;
}
//--
public DVMCompilationTask(DVMConfiguration configuration, DVMSettings dvmSettings, Group group, Test test, int kernels_in){
super (configuration, group, test,checkFlags(dvmSettings.flags));
public DVMCompilationTask(DVMConfiguration configuration, DVMSettings dvmSettings, Group group, Test test, int kernels_in) {
super(configuration, group, test, checkFlags(dvmSettings.flags));
Vector<String> matrixes = dvmSettings.getMatrixes(test.max_dim);
String checkedEnvironments = checkEnvironments(dvmSettings.environments);
if (dvmSettings.flags.trim().equalsIgnoreCase("-s")) {
@@ -71,4 +43,31 @@ public class DVMCompilationTask extends DVMTask {
kernels_in));
}
}
//--
public static String checkFlags(String flags_in) {
if (!flags_in.contains("-shared-dvm")) {
if (flags_in.isEmpty())
return "-shared-dvm";
else return flags_in + " -shared-dvm";
} else
return flags_in;
}
public static String checkEnvironments(String environmentsSet_in) {
if (!environmentsSet_in.contains("DVMH_NO_DIRECT_COPY")) {
if (environmentsSet_in.isEmpty())
return "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
else
return environmentsSet_in + " " + "DVMH_NO_DIRECT_COPY=" + Utils_.DQuotes("1");
} else
return environmentsSet_in;
}
@Override
public Vector<String> pack(Object arg) {
Vector<String> res = new Vector<>();
res.add(String.valueOf(id)); //1
res.add(String.valueOf(maxtime)); //2
res.add(String.valueOf(test_id)); //3
res.add(arg.toString().replace("\n", "|")); //4
return res;
}
}

14
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTask.java
View File

@@ -1,15 +1,15 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.CommonConstants;
import _VisualDVM.Constants;
import Common.Database.Objects.DBObject;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.TestingSystem.Common.Test.TestType;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.Utils;
import com.google.gson.annotations.Expose;
import java.io.File;
@@ -68,6 +68,9 @@ public class DVMRunTask extends DVMTask {
}
public DVMRunTask() {
}
public DVMRunTask(DVMRunTask src) {
this.SynchronizeFields(src);
}
@Override
public void SynchronizeFields(DBObject src) {
super.SynchronizeFields(src);
@@ -88,9 +91,6 @@ public class DVMRunTask extends DVMTask {
compilation_time = rt.compilation_time;
args = rt.args;
}
public DVMRunTask(DVMRunTask src) {
this.SynchronizeFields(src);
}
//-
@Override
public Vector<String> pack(Object arg) {
@@ -124,10 +124,10 @@ public class DVMRunTask extends DVMTask {
).toFile();
}
public String getCompilationOutput() {
return getResultFile(new File(getCompilationTaskWorkspace(),Constants.out_file));
return getResultFile(new File(getCompilationTaskWorkspace(), Constants.out_file));
}
public String getCompilationErrors() {
return getResultFile(new File(getCompilationTaskWorkspace(),Constants.err_file));
return getResultFile(new File(getCompilationTaskWorkspace(), Constants.err_file));
}
public String getStatistic() {
return getResultFile(new File(getLocalWorkspace(), Constants.statistic + ".txt"));

12
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMRunTasksSet.java
View File

@@ -1,9 +1,9 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import _VisualDVM.Current;
import Common.Visual.DBObjectFilter;
import Common.Database.Tables.DataSet;
import Common.Visual.DataSetFilter;
import Common.Visual.DBObjectFilter;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFilter;
import _VisualDVM.Current;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
@@ -14,6 +14,9 @@ import static Common.Visual.Tables.TableRenderers.RendererStatusEnum;
public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
//todo обобщить бы наличие фильтров для всех таблиц.
DVMPackage target;
public DVMRunTasksSet() {
super(Integer.class, DVMRunTask.class);
}
@Override
protected void createFilters() {
filters.add(new DataSetFilter<DVMRunTask>("Компиляция", this) {
@@ -47,9 +50,6 @@ public class DVMRunTasksSet extends DataSet<Integer, DVMRunTask> {
}
});
}
public DVMRunTasksSet() {
super(Integer.class, DVMRunTask.class);
}
@Override
public String getSingleDescription() {
return "задача";

32
src/_VisualDVM/TestingSystem/DVM/DVMTasks/DVMTask.java
View File

@@ -1,8 +1,8 @@
package _VisualDVM.TestingSystem.DVM.DVMTasks;
import Common.CommonConstants;
import _VisualDVM.Constants;
import Common.Database.Objects.DBObject;
import Common.Database.Objects.iDBObject;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.LanguageName;
@@ -42,6 +42,21 @@ public class DVMTask extends iDBObject {
//результаты-------------------------------
@Expose
public double Time; //время выполнения.
public DVMTask(DVMTask src) {
this.SynchronizeFields(src);
}
public DVMTask() {
}
public DVMTask(DVMConfiguration configuration,
Group group, Test test, String flags_in) {
group_id = group.id;
test_id = test.id;
group_description = group.description;
test_description = test.description;
test_type = group.type;
language = group.language;
flags = flags_in;
}
//------------------------------------------------------
@Override
public void SynchronizeFields(DBObject src) {
@@ -59,21 +74,6 @@ public class DVMTask extends iDBObject {
test_type = t.test_type;
Time = t.Time;
}
public DVMTask(DVMTask src) {
this.SynchronizeFields(src);
}
public DVMTask() {
}
public DVMTask(DVMConfiguration configuration,
Group group, Test test, String flags_in) {
group_id = group.id;
test_id = test.id;
group_description = group.description;
test_description = test.description;
test_type = group.type;
language = group.language;
flags = flags_in;
}
public File getLocalWorkspace() {
return
Paths.get(Global.DVMPackagesDirectory.getAbsolutePath(),

20
src/_VisualDVM/TestingSystem/DVM/DVMTestingPlanner.java
View File

@@ -1,7 +1,6 @@
package _VisualDVM.TestingSystem.DVM;
import Common.Utils.Utils_;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.ProjectData.Files.ProjectFile;
import _VisualDVM.ProjectData.LanguageName;
@@ -11,6 +10,7 @@ import _VisualDVM.TestingSystem.Common.TestingPlanner;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMTask;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -24,15 +24,6 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
public DVMTestingPlanner(String[] args) {
super(args);
}
LinkedHashMap<Integer, File> getTestsFromJson() {
LinkedHashMap<Integer, File> res = new LinkedHashMap<>();
for (DVMCompilationTask task : testingPackage.package_json.compilationTasks) {
if (!res.containsKey(task.test_id)) {
res.put(task.test_id, Paths.get(Global.TestsDirectory.getAbsolutePath(), String.valueOf(task.test_id)).toFile());
}
}
return res;
}
static LinkedHashMap<LanguageName, Vector<ProjectFile>> getTestPrograms(File test) {
LinkedHashMap<LanguageName, Vector<ProjectFile>> res = new LinkedHashMap<>();
//--
@@ -86,6 +77,15 @@ public abstract class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
//----->>
return String.join("\n", "LINK_COMMAND=" + Utils_.DQuotes(dvm_drv) + " " + test_language.getDVMLink(), "LINK_FLAGS=" + flags + "\n", String.join("\n", titles), "all: " + binary, binary + " : " + String.join(" ", objects), "\t" + Utils.MFVar("LINK_COMMAND") + " " + Utils.MFVar("LINK_FLAGS") + " " + String.join(" ", objects) + " -o " + binary, String.join(" ", bodies));
}
LinkedHashMap<Integer, File> getTestsFromJson() {
LinkedHashMap<Integer, File> res = new LinkedHashMap<>();
for (DVMCompilationTask task : testingPackage.package_json.compilationTasks) {
if (!res.containsKey(task.test_id)) {
res.put(task.test_id, Paths.get(Global.TestsDirectory.getAbsolutePath(), String.valueOf(task.test_id)).toFile());
}
}
return res;
}
public void getTasksInfo(List<? extends DVMTask> tasks, String file_name) throws Exception {
LinkedHashMap<Integer, DVMTask> sorted_tasks = new LinkedHashMap<>();
for (DVMTask task : tasks)

5
src/_VisualDVM/TestingSystem/DVM/LocalDVMTestingPlanner.java
View File

@@ -56,9 +56,9 @@ public class LocalDVMTestingPlanner extends DVMTestingPlanner {
//синхронизировать их.
for (int test_id : tests.keySet()) {
File test = tests.get(test_id);
File testDst = Paths.get(testingPackage.user_workspace,"projects", String.valueOf(test_id)).toFile();
File testDst = Paths.get(testingPackage.user_workspace, "projects", String.valueOf(test_id)).toFile();
Print(testDst.getAbsolutePath());
FileUtils.copyDirectory(test,testDst);
FileUtils.copyDirectory(test, testDst);
}
Finalize("+");
}
@@ -81,5 +81,4 @@ public class LocalDVMTestingPlanner extends DVMTestingPlanner {
@Override
protected void Kill() throws Exception {
}
}

12
src/_VisualDVM/TestingSystem/DVM/RemoteDVMTestingPlanner.java
View File

@@ -2,13 +2,13 @@ package _VisualDVM.TestingSystem.DVM;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Global;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.Passes.All.UnzipFolderPass;
import _VisualDVM.Utils;
import javafx.util.Pair;
import org.apache.commons.io.FileUtils;
@@ -105,7 +105,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
//--
int ct_count = 0;
int rt_count = 0;
int good=0;
int good = 0;
//--
for (DVMCompilationTask compilationTask : testingPackage.package_json.compilationTasks) {
compilationTask.dvm_package_id = testingPackage.id;
@@ -164,9 +164,9 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
testingPackage.saveJson(); //запись обновленных результатов пакета в json!
Print("analysis done, ct_count=" + ct_count + " rt count=" + rt_count);
testingPackage.state = hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
double percent = ( ((double)(good))/testingPackage.tasksCount)*100.0;
testingPackage.description = "Выполнено на "+((int)percent)+"%\n"+
"Всего задач: "+testingPackage.tasksCount+", из них с ошибками "+(testingPackage.tasksCount-good);
double percent = (((double) (good)) / testingPackage.tasksCount) * 100.0;
testingPackage.description = "Выполнено на " + ((int) percent) + "%\n" +
"Всего задач: " + testingPackage.tasksCount + ", из них с ошибками " + (testingPackage.tasksCount - good);
UpdatePackageState();
}
@Override

6
src/_VisualDVM/TestingSystem/DVM/UserConnection.java
View File

@@ -1,13 +1,13 @@
package _VisualDVM.TestingSystem.DVM;
import Common.CommonConstants;
import Common.Passes.PassException;
import Common.Utils.Utils_;
import _VisualDVM.Constants;
import _VisualDVM.Utils;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.ProjectData.Project.db_project_info;
import Common.Passes.PassException;
import _VisualDVM.Utils;
import com.jcraft.jsch.*;
import javafx.util.Pair;
@@ -193,7 +193,6 @@ public class UserConnection {
try {
sftpChannel.lstat(file_full_name);
return true;
} catch (SftpException e) {
if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
// file doesn't exist
@@ -208,7 +207,6 @@ public class UserConnection {
try {
sftpChannel.lstat(file_full_name);
return true;
} catch (SftpException e) {
if (e.id == ChannelSftp.SSH_FX_PERMISSION_DENIED) {
// file busy