no message

This commit is contained in:
2025-04-13 17:54:56 +03:00
parent 46e1bd17f1
commit cd86f1257a
5 changed files with 14 additions and 12 deletions

7
.idea/workspace.xml generated
View File

@@ -8,15 +8,10 @@
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InlineProcedures.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCallH.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Инструкция по распараллеливанию в системе SAPFOR.pptx" beforeDir="false" afterPath="$PROJECT_DIR$/Инструкция по распараллеливанию в системе SAPFOR.pptx" 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" />

View File

@@ -493,6 +493,13 @@ public class DBProjectFile extends ProjectFile {
//-- //--
for (FuncInfo funcInfo: funcInfos_in){ for (FuncInfo funcInfo: funcInfos_in){
//-- //--
funcInfo.file = this.name;
funcInfo.ownCalls = new LinkedHashMap<>();
//--
for (FuncCall call: funcInfo.callsFrom){
call.file = this.name;
call.parentLineOffset = funcInfo.line - call.line;
}
if (funcInfo.isMain!=0){ if (funcInfo.isMain!=0){
isMain = 1; isMain = 1;
funcInfo.type = FunctionType.Main; funcInfo.type = FunctionType.Main;
@@ -502,9 +509,9 @@ public class DBProjectFile extends ProjectFile {
funcInfo.type = FunctionType.Default; funcInfo.type = FunctionType.Default;
} }
//-- //--
funcInfo.ownCalls = new LinkedHashMap<>();
function_decls.put(funcInfo.funcName, funcInfo); function_decls.put(funcInfo.funcName, funcInfo);
call_count+=funcInfo.callsFrom.size(); call_count+=funcInfo.callsFrom.size();
} }
//-- //--
CallGraphTitle = "Объявлений : " + function_decls.size() + "; Вызовов : " + call_count; CallGraphTitle = "Объявлений : " + function_decls.size() + "; Вызовов : " + call_count;

View File

@@ -778,7 +778,7 @@ public class db_project_info extends DBObject {
if (!decl1.ownCalls.containsKey(call.file)) if (!decl1.ownCalls.containsKey(call.file))
decl1.ownCalls.put(call.file, new Vector<>()); decl1.ownCalls.put(call.file, new Vector<>());
if (decl1.needToInline==1) call.Select(true); if (decl1.needToInline==1) call.Select(true);
call.canBeInlined = (decl1.doNotInline==1)?0:1; call.canBeInlined = decl1.doNotInline==0;
decl1.ownCalls.get(call.file).add(call); decl1.ownCalls.get(call.file).add(call);
node.add(new DefaultMutableTreeNode(call)); node.add(new DefaultMutableTreeNode(call));
} }

View File

@@ -11,9 +11,9 @@ public class FuncCall extends FileObjectWithMessages{
//JSON------------------------------------------ //JSON------------------------------------------
@Expose @Expose
public String funcName = ""; public String funcName = "";
public int canBeInlined = 0;
public int parentLineOffset = 0;// line объявления - line вычислять?
//END OF JSON------------------------------------ //END OF JSON------------------------------------
public int parentLineOffset = 0;// line объявления - line вычислять?
public boolean canBeInlined = false;
@Description("IGNORE") @Description("IGNORE")
private boolean selected = false; private boolean selected = false;
//--- //---
@@ -30,7 +30,7 @@ public class FuncCall extends FileObjectWithMessages{
} }
@Override @Override
public boolean isSelectionEnabled() { public boolean isSelectionEnabled() {
return canBeInlined!=0; return canBeInlined;
} }
@Override @Override
public String getSelectionText() { public String getSelectionText() {

View File

@@ -24,7 +24,7 @@ public class FuncCallH extends FuncCall {
file = funcInfo.file; file = funcInfo.file;
line = funcInfo.line; line = funcInfo.line;
funcName = funcInfo.funcName; funcName = funcInfo.funcName;
canBeInlined = 1; canBeInlined = true;
parentLineOffset = 0; parentLineOffset = 0;
} }
@Override @Override