новый проход. v++

This commit is contained in:
2024-11-17 17:04:08 +03:00
parent 3dd7845d76
commit 1259db5041
7 changed files with 25 additions and 18 deletions

18
.idea/workspace.xml generated
View File

@@ -7,17 +7,13 @@
</component> </component>
<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 afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_RemoveDistArraysFromIO.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/icons/Transformations/SPF_RemoveDistArraysFromIO.png" afterDir="false" />
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/GlobalDatabase.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/SSH/RepositoryServerSSHPass.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/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CheckAccount.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/MainUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/MainForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" 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" />
@@ -96,7 +92,7 @@
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" /> <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.SHOW" value="true" />
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" /> <property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager.WIDTH" value="509" />
<property name="extract.method.default.visibility" value="public" /> <property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/Common/icons" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/src/icons/Transformations" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
@@ -109,9 +105,9 @@
<recent name="controls.Trees" /> <recent name="controls.Trees" />
</key> </key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\Common\icons" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\Transformations" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\icons\versions" />
<recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" /> <recent name="C:\Users\misha\Documents\visual_sapfor_2023\src\files" />
</key> </key>

View File

@@ -26,14 +26,14 @@
"BugReportsDBName": "bug_reports.sqlite", "BugReportsDBName": "bug_reports.sqlite",
"TestsDBName": "tests.sqlite", "TestsDBName": "tests.sqlite",
"ComponentsWindowWidth": 843, "ComponentsWindowWidth": 843,
"ComponentsWindowHeight": 250, "ComponentsWindowHeight": 519,
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents", "Visualizer_2Path": "C:\\Users\\misha\\Documents",
"InstructionPath": "", "InstructionPath": "",
"PerformanceAnalyzerPath": "", "PerformanceAnalyzerPath": "",
"ComponentsBackUpsCount": 10, "ComponentsBackUpsCount": 10,
"AutoCheckTesting": false, "AutoCheckTesting": true,
"CheckTestingIntervalSeconds": 10, "CheckTestingIntervalSeconds": 10,
"EmailOnTestingProgress": false, "EmailOnTestingProgress": false,
"eraseTestingWorkspaces": true, "eraseTestingWorkspaces": true,

View File

@@ -0,0 +1,4 @@
package _VisualDVM.Passes.All;
import _VisualDVM.Passes.Sapfor.SapforTransformation;
public class SPF_RemoveDistArraysFromIO extends SapforTransformation {
}

View File

@@ -108,6 +108,7 @@ public enum PassCode implements PassCode_ {
SPF_SharedMemoryParallelization, SPF_SharedMemoryParallelization,
SPF_RemoveOmpDirectives, SPF_RemoveOmpDirectives,
SPF_RenameIncludes, SPF_RenameIncludes,
SPF_RemoveDistArraysFromIO,
// //
RestoreSavedArrays, RestoreSavedArrays,
MassSelectArrays, MassSelectArrays,
@@ -350,13 +351,13 @@ public enum PassCode implements PassCode_ {
DeleteDVMSettings, DeleteDVMSettings,
CloneDVMSettings, CloneDVMSettings,
CloneSapforSettings, CloneSapforSettings,
SetSapforConfigurationEthalon SetSapforConfigurationEthalon;
;
//--
//-- //--
@Override @Override
public String getDescription() { public String getDescription() {
switch (this) { switch (this) {
case SPF_RemoveDistArraysFromIO:
return "Устранение конфликтов ввода вывода";
case StartSelectedSAPFORConfigurations: case StartSelectedSAPFORConfigurations:
return "Запустить отмеченные конфигурации"; return "Запустить отмеченные конфигурации";
case ShowCurrentSAPFORConfigurationTests: case ShowCurrentSAPFORConfigurationTests:
@@ -906,6 +907,9 @@ public enum PassCode implements PassCode_ {
case SPF_RemoveDeadCode: case SPF_RemoveDeadCode:
name = "REMOVE_DEAD_CODE_AND_UNPARSE"; name = "REMOVE_DEAD_CODE_AND_UNPARSE";
break; break;
case SPF_RemoveDistArraysFromIO:
name = "REMOVE_DIST_ARRAYS_FROM_IO";
break;
} }
return p + " " + name; return p + " " + name;
} }

View File

@@ -64,7 +64,7 @@ public abstract class RepositoryServerSSHPass extends ConnectionPass {
//-- //--
ShowMessage1("Создание файла INTERRUPT.."); ShowMessage1("Создание файла INTERRUPT..");
user.connection.writeToFile("", INTERRUPT); user.connection.writeToFile("", INTERRUPT);
ShowMessage1("Ожидание остановки сервера тестирования"); ShowMessage1("Ожидание остановки сервера...");
do { do {
Utils_.sleep(1000); Utils_.sleep(1000);
ShowMessage2("Проверка признака остановки.."); ShowMessage2("Проверка признака остановки..");

View File

@@ -1,5 +1,6 @@
package _VisualDVM.Repository.Component.Sapfor; package _VisualDVM.Repository.Component.Sapfor;
import Common.CommonConstants; import Common.CommonConstants;
import Common.Passes.Pass;
import Common.Passes.PassException; import Common.Passes.PassException;
import Common.Utils.Utils_; import Common.Utils.Utils_;
import Common.Visual.UI; import Common.Visual.UI;
@@ -102,7 +103,8 @@ public abstract class Sapfor extends OSDComponent {
public static PassCode[] getRegionsTransformationsCodes() { public static PassCode[] getRegionsTransformationsCodes() {
return new PassCode[]{ return new PassCode[]{
PassCode.SPF_ResolveParallelRegionConflicts, PassCode.SPF_ResolveParallelRegionConflicts,
PassCode.SPF_InsertDvmhRegions PassCode.SPF_InsertDvmhRegions,
PassCode.SPF_RemoveDistArraysFromIO
}; };
} }
public static PassCode[] getPreparationTransformationsCodes() { public static PassCode[] getPreparationTransformationsCodes() {
@@ -156,6 +158,7 @@ public abstract class Sapfor extends OSDComponent {
res.add(PassCode.SPF_DuplicateFunctionChains);//+ res.add(PassCode.SPF_DuplicateFunctionChains);//+
//-- //--
res.add(PassCode.SPF_ResolveParallelRegionConflicts);//+ res.add(PassCode.SPF_ResolveParallelRegionConflicts);//+
res.add(PassCode.SPF_RemoveDistArraysFromIO);
res.add(PassCode.SPF_ResolveCommonBlockConflicts);//+ res.add(PassCode.SPF_ResolveCommonBlockConflicts);//+
//- //-
res.add(PassCode.SPF_InsertDvmhRegions);//+ res.add(PassCode.SPF_InsertDvmhRegions);//+

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB