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-01-11 23:19:24 +03:00
parent 7a06c2ce2b
commit d2c4794690
9 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/workspace.xml generated
View File

@@ -10,7 +10,6 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingName.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/Supervisor/Local/Windows/WindowsLocalCompilationSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalProperties.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/Precompilation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateProperty.java" afterDir="false" />

1
properties
View File

@@ -38,6 +38,7 @@
"InstructionPath": "",
"PerformanceAnalyzerPath": "",
"LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
"Kernels": 8,
"ComponentsBackUpsCount": 10,
"AutoCheckTesting": true,
"CheckTestingIntervalSeconds": 10,

3
src/_VisualDVM/GlobalData/Settings/SettingName.java
View File

@@ -6,7 +6,6 @@ public enum SettingName {
SaveModifications, // сохранять исходную версию
GCOVLimit,
DVMConvertationOptions,
Kernels,
//--
//<editor-fold desc="Настройки сапфора. должны быть подряд!">
STATIC_SHADOW_ANALYSIS,
@@ -39,8 +38,6 @@ public enum SettingName {
return "Сохранять копию исходной версии при преобразованиях";
case DVMConvertationOptions:
return "Опции DVM конвертации";
case Kernels:
return "Число ядер при компиляции";
case GCOVLimit:
return "Нижний порог отображения GCOV";
case Precompilation:

1
src/_VisualDVM/GlobalData/Settings/SettingsDBTable.java
View File

@@ -30,7 +30,6 @@ public class SettingsDBTable extends DBTable<SettingName, DBSetting> {
public void AddAll() throws Exception {
//проверка списка всех настроек.
//<editor-fold desc="Global">
AddSetting(new DBSetting(SettingName.Kernels, Utils.getHalfKernels(), SettingType.IntField, ComponentType.Visualiser));
//</editor-fold>
//--
//<editor-fold desc="Sapfor">

4
src/_VisualDVM/GlobalProperties.java
View File

@@ -94,6 +94,8 @@ public class GlobalProperties {
@Expose
public String LocalMakePathWindows= "C:\\MinGW\\msys\\1.0\\bin\\make.exe";
@Expose
public int Kernels= Utils.getHalfKernels();
@Expose
public int ComponentsBackUpsCount = 10;
@Expose
public boolean AutoCheckTesting = false; // проверять ли задачи тестирования при включенном визуализаторе.
@@ -187,6 +189,8 @@ public class GlobalProperties {
//-----------------
public String getFieldDescription(String fieldName) {
switch (fieldName) {
case "Kernels":
return "Число ядер при компиляции";
case "LocalMakePathWindows":
return "Путь к make.exe";
case "SmallScreen":

4
src/_VisualDVM/Passes/All/Precompilation.java
View File

@@ -185,10 +185,10 @@ public class Precompilation extends Pass<db_project_info> {
protected void body() throws Exception {
if (Utils_.isWindows()) {
name_to_kill = "make.exe";
StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(),
StartProcess(Utils_.DQuotes(Global.properties.LocalMakePathWindows) + " -j " + Global.properties.Kernels,
target.compilation_maxtime);
} else
StartProcess("make -j " + (Global.mainModule.getDb()).settings.get(SettingName.Kernels).toString(), target.compilation_maxtime);
StartProcess("make -j " + Global.properties.Kernels, target.compilation_maxtime);
}
protected void StartProcess(String command, int TA) throws Exception {
killed = false;

5
src/_VisualDVM/Passes/All/UpdateProperty.java
View File

@@ -8,6 +8,7 @@ import Common.Visual.Windows.Dialog.VFileChooser;
import _VisualDVM.Global;
import _VisualDVM.GlobalProperties;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import javax.swing.*;
import java.io.File;
@@ -35,6 +36,10 @@ public class UpdateProperty extends Pass<Object> {
return true;
}
switch (name){
case "Kernels":
if (sliderNumberForm.ShowDialog(description, oldValue, 1, Utils.getMaxKernels()))
newValue=sliderNumberForm.Result;
break;
case "LocalMakePathWindows":
fileChooser.setTitle(description);
File file = fileChooser.ShowDialog();

13
src/_VisualDVM/Passes/All/UpdateSetting.java
View File

@@ -41,19 +41,6 @@ public class UpdateSetting extends Pass<DBSetting> {
break;
}
break;
case IntField:
int min = 0;
int max = 0;
switch (target.Name) {
case Kernels:
min = 1;
max = Utils.getMaxKernels();
SliderNumberForm ffff = new SliderNumberForm();
if (ffff.ShowDialog(target.Name.getDescription(), target.toInt32(), min, max))
NewValue = String.valueOf(ffff.Result);
break;
}
break;
}
} else {
NewValue = args[1].toString();

18
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
View File

@@ -21,19 +21,19 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
add(new SettingsSubmenu("Компиляция на локальной машине", null){
{
add(Global.properties.getMenuItem("LocalMakePathWindows"));
add(Global.properties.getMenuItem("Kernels"));
}
}
);
}else {
add(new SettingsSubmenu("Компиляция на локальной машине", null){
{
add(Global.properties.getMenuItem("Kernels"));
}
}
);
}
/*
SettingName.Kernels
));
} else {
add(new SettingsSubmenu("Компиляция на локальной машине", null,
SettingName.Kernels
));
}
*/
add(new SynchronizationSettingsMenu());
add(new VersionsComparisonMenu());
add(Global.properties.getMenuItem("Workspace"));