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
2025-03-13 00:32:20 +03:00
parent 91e40c4393
commit 1d97048de1
204 changed files with 984 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java
View File

@@ -2,7 +2,6 @@ package _VisualDVM.TestingSystem.DVM.DVMConfiguration.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
@@ -14,9 +13,10 @@ import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration> {
public class DVMConfigurationsForm extends RDataSetControlForm<DVMConfiguration> {
public DVMConfigurationsForm(DataSet<?, DVMConfiguration> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -124,6 +124,5 @@ public class DVMConfigurationsForm extends DataSetControlForm<DVMConfiguration>
}
);
}
}

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

@@ -73,7 +73,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
DVMSettingsCache settingsCache = (DVMSettingsCache) VisualCaches.GetCache(dvmSettings);
Vector<Pair<String, String>> params = settingsCache.getTasksParameters();
//---
for (Pair<String, String> p: params) {
for (Pair<String, String> p : params) {
//--
String options_ = Global.normalProperties.CompleteCompilationOptions ?
completeOptions(p.getKey()) : p.getKey();
@@ -96,7 +96,7 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
environments_,
kernels
));
}else {
} else {
for (String matrix : matrixes) {
compilationTask.runTasks.add(new DVMRunTask(
configuration,
@@ -123,6 +123,23 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
super(p);
this.SynchronizeFields(p);
}
public static String completeOptions(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 completeEnvironments(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 Class getJsonClass() {
return DVMPackage_json.class;
@@ -151,25 +168,8 @@ public class DVMPackage extends TestingPackage<DVMPackage_json> {
@Override
public void checkFinishState() throws Exception {
}
public String getMachineURL(){
public String getMachineURL() {
return machine_address + ":" + machine_port;
}
public static String completeOptions(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 completeEnvironments(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;
}
}

13
src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
View File

@@ -2,29 +2,24 @@ package _VisualDVM.TestingSystem.DVM.DVMPackage.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.Controls.StableMenuItem;
import Common.Visual.DataSetControlForm;
import Common.Visual.DataSetFiltersMenu;
import Common.Visual.FilterFlag;
import Common.Visual.FilterMenuFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.RendererDate;
import Common.Visual.Tables.RendererMilliseconds;
import Common.Visual.Tables.RendererProgressBar;
import _VisualDVM.Global;
import _VisualDVM.GlobalData.Tasks.TaskState;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.PackageCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.Common.TasksPackageState;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
import _VisualDVM.Visual.RDataSetControlForm;
import _VisualDVM.Visual.Tables.RendererTestingPackageStatus;
import javax.swing.*;
import java.util.Comparator;
public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
public class DVMPackagesForm extends RDataSetControlForm<DVMPackage> {
public DVMPackagesForm(DataSet<?, DVMPackage> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}
@@ -154,7 +149,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
{
addPasses(PassCode.SynchronizeTests);
addSeparator();
addPasses(PassCode.PauseDVMPackage,PassCode.ResumeDVMPackage,PassCode.AbortDVMPackage);
addPasses(PassCode.PauseDVMPackage, PassCode.ResumeDVMPackage, PassCode.AbortDVMPackage);
addSeparator();
addPasses(PassCode.DownloadDVMPackage,
PassCode.RefreshDVMPackageResults,
@@ -199,7 +194,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
return object.state.equals(TasksPackageState.DoneWithErrors);
}
}
);
);
}
@Override
protected Comparator<DVMPackage> getDefaultComparator() {

2
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java
View File

@@ -49,7 +49,7 @@ public class DVMSettingsDialog extends DBObjectDialog<DVMSettings, DVMSettingsFi
Result.Is_DVM_STAT = fields.cbDvmStat.isSelected() ? 1 : 0;
//--
Result.packedCompilationOptionsJson = Utils_.gson.toJson(fields.optionsLines.toJson());
Result.packedRunEnvironmentValuesJson= Utils_.gson.toJson(fields.environmentsLines.toJson());
Result.packedRunEnvironmentValuesJson = Utils_.gson.toJson(fields.environmentsLines.toJson());
}
@Override
public void SetReadonly() {

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

@@ -3,13 +3,9 @@ import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.TextField.StyledTextField;
import Common.Visual.Windows.Dialog.DialogFields;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLine;
import _VisualDVM.GlobalData.CompilerEnvironment.EnvironmentsLinesSet;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsJson;
import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsJson;
import _VisualDVM.GlobalData.CompilerOption.Json.OptionsSetJson;
import _VisualDVM.GlobalData.CompilerOption.OptionsLine;
import _VisualDVM.GlobalData.CompilerOption.OptionsLinesSet;
import javax.swing.*;
@@ -22,22 +18,28 @@ public class DVMSettingsFields implements DialogFields {
public JCheckBox cbCube;
public JTextField tfEnvironments;
public JCheckBox cbDvmStat;
private JPanel content;
public JButton bAddFlags;
public JButton bAddEnvironments;
public JButton bDeleteFlags;
public JButton bDeleteEnvironment;
//
public OptionsLinesSet optionsLines;
public EnvironmentsLinesSet environmentsLines;
private JPanel content;
private JPanel optionsLinesPanel;
private JPanel environmentsLinesPanel;
private JSplitPane SC1;
private JSplitPane SC2;
//
public OptionsLinesSet optionsLines;
public EnvironmentsLinesSet environmentsLines;
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));
//-
}
//
public void fillOptionsLines(String packed) {
OptionsSetJson optionsSetJson = packed.isEmpty() ? new OptionsSetJson() : Utils_.gson.fromJson(packed, OptionsSetJson.class);
optionsLines= new OptionsLinesSet(optionsSetJson);
optionsLines = new OptionsLinesSet(optionsSetJson);
//-
//-Это нужно для того, чтобы старый меню бар был пересоздан. бары создаются один раз в целях экономии памяти.
// В противном случае бар его проходы добавления редактирования и удаления
@@ -49,20 +51,13 @@ public class DVMSettingsFields implements DialogFields {
}
public void fillEnvironmentsLines(String packed) {
EnvironmentsSetJson environmentsSetJson = packed.isEmpty() ? new EnvironmentsSetJson() : Utils_.gson.fromJson(packed, EnvironmentsSetJson.class);
environmentsLines =new EnvironmentsLinesSet(environmentsSetJson);
environmentsLines = new EnvironmentsLinesSet(environmentsSetJson);
//-
if (MainModule_.instance.getUI().menuBars.containsKey(EnvironmentsLinesSet.class))
MainModule_.instance.getUI().menuBars.remove(EnvironmentsLinesSet.class);
environmentsLines.mountUI(environmentsLinesPanel);
environmentsLines.ShowUI();
}
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));
//-
}
@Override
public Component getContent() {
return content;

6
src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsForm.java
View File

@@ -2,22 +2,20 @@ package _VisualDVM.TestingSystem.DVM.DVMSettings.UI;
import Common.Database.Tables.DataSet;
import Common.Passes.PassCode_;
import Common.Visual.Controls.MenuBarButton;
import Common.Visual.DataSetControlForm;
import Common.Visual.FilterFlag;
import Common.Visual.Menus.DataMenuBar;
import Common.Visual.Tables.ColumnInfo;
import Common.Visual.Tables.HeaderTextFilter;
import Common.Visual.Tables.RendererMultiline;
import Common.Visual.Windows.Dialog.DBObjectDialog;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.ServerObjectsCache.ConfigurationCache;
import _VisualDVM.ServerObjectsCache.DVMSettingsCache;
import _VisualDVM.ServerObjectsCache.VisualCaches;
import _VisualDVM.TestingSystem.DVM.DVMSettings.DVMSettings;
import _VisualDVM.Visual.RDataSetControlForm;
import javax.swing.*;
public class DVMSettingsForm extends DataSetControlForm<DVMSettings> {
public class DVMSettingsForm extends RDataSetControlForm<DVMSettings> {
public DVMSettingsForm(DataSet<?, DVMSettings> dataSource_in, JPanel mountPanel_in) {
super(dataSource_in, mountPanel_in);
}

3
src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackageCredentials.java
View File

@@ -1,9 +1,6 @@
package _VisualDVM.TestingSystem.DVM.PackageCredentials;
import Common.CommonConstants;
import Common.Database.Objects.iDBObject;
import _VisualDVM.GlobalData.Machine.Machine;
import _VisualDVM.GlobalData.Machine.MachineType;
import _VisualDVM.GlobalData.User.User;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
public class DVMPackageCredentials extends iDBObject {
public int dvmpackage_id = CommonConstants.Nan;

7
src/_VisualDVM/TestingSystem/DVM/PackageCredentials/DVMPackagesCredentialsDBTable.java
View File

@@ -1,13 +1,12 @@
package _VisualDVM.TestingSystem.DVM.PackageCredentials;
import Common.Database.Tables.iDBTable;
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
public class DVMPackagesCredentialsDBTable extends iDBTable<DVMPackageCredentials> {
public DVMPackagesCredentialsDBTable() {
super(DVMPackageCredentials.class);
}
public DVMPackageCredentials getForPackageId(int dvmPackage_id){
for (DVMPackageCredentials dvmPackageCredentials: Data.values()){
if (dvmPackageCredentials.dvmpackage_id==dvmPackage_id)
public DVMPackageCredentials getForPackageId(int dvmPackage_id) {
for (DVMPackageCredentials dvmPackageCredentials : Data.values()) {
if (dvmPackageCredentials.dvmpackage_id == dvmPackage_id)
return dvmPackageCredentials;
}
return null;

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

@@ -177,8 +177,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
File unpacked_results = new File(packageLocalWorkspace.getAbsolutePath(), "results");
try {
Utils_.forceDeleteWithCheck(unpacked_results);
}
catch (Exception ex){
} catch (Exception ex) {
ex.printStackTrace();
}
}

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

@@ -252,7 +252,7 @@ public class UserConnection {
boolean planner = module_name.equals("planner");
String flags = planner ? getAvailibleCPPStandard(modulesDirectory) : "";
String command = "g++ -O3 " + flags + " " + Utils_.DQuotes(module_name + ".cpp") + " -o " + Utils_.DQuotes(module_name);
if (planner&& flags.contains("c++17")) command+=" -lstdc++fs";
if (planner && flags.contains("c++17")) command += " -lstdc++fs";
RemoteFile binary = new RemoteFile(modulesDirectory, module_name);
//--
if (Exists(binary))
@@ -476,7 +476,6 @@ public class UserConnection {
System.gc();
}
*/
public void waitForFileCreation(RemoteFile file) throws Exception {
while (!Exists(file)) {
System.out.println(file.full_name + " NOT FOUND");