From b46f86bebb0975cf0922f36880603f9ac55e9c0c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Fri, 2 May 2025 22:41:56 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D0=B3=D0=BA=D0=BE=D0=B2=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=B6=D1=81=D0=BE=D0=BD.=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=BE=D1=82=D1=80=D0=B8?=
 =?UTF-8?q?=D1=86=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B4=20=D0=B8=D0=BD=D1=84=D1=8B=20=D0=BF=D0=BE=20=D0=B4?=
 =?UTF-8?q?=D0=B6=D1=81=D0=BE=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  6 +---
 properties                                    |  2 +-
 src/_VisualDVM/Constants.java                 |  2 +-
 .../Passes/All/SPF_GetGCovInfo.java           | 35 ++++++-------------
 .../ProjectData/SapforData/GCOV/GCOVJson.java |  2 +-
 5 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 219f3fcd..b1d6ac13 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/GCOV/FileGCOVJson.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/GCOV/LineGCOVJson.java" 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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetIncludeDependencies.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 9b46e816..a419edbf 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1745956769\\composit",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 924d3b0b..7c592bc4 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1244;
+    public static final int version = 1245;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
diff --git a/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java
index 56960ffa..cddda8d8 100644
--- a/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java
+++ b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java
@@ -55,43 +55,26 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
     }
     protected void unpack(String packed) throws Exception {
         GCOVJson allJson = Utils_.gson.fromJson(packed, GCOVJson.class);
-        for (FileGCOVJson fileJson: allJson.allGCOV){
+     //   System.out.println("packed="+ Utils_.Brackets(packed));
+     //   System.out.println(allJson.allGCov.size());
+        for (FileGCOVJson fileJson: allJson.allGCov){
             fileJson.file = Utils_.toW(fileJson.file);
             //--
             DBProjectFile projectFile = target.db.files.get(fileJson.file);
             for (LineGCOVJson lineJson: fileJson.lines){
                 if (lineJson.line > 0) {
                     int v_line = lineJson.line - 1;
+                    long v_execution = (lineJson.execution >= 0) ? lineJson.execution : 0;
+                //    System.out.println("line="+v_line+"/"+v_execution);
                     if (!projectFile.gcov_info.line_info.containsKey(v_line)) {
-                        projectFile.gcov_info.add_line(v_line,
-                                (lineJson.execution >= 0) ? lineJson.execution : 0);
+                        projectFile.gcov_info.add_line(v_line, v_execution);
+                  //      System.out.println("+");
                     }
                 }
             }
             //завешение настроек.
             projectFile.gcov_info.setup();
         }
-        /*
-        String[] byFiles = packed.split("@");
-        for (int z = 0; z < byFiles.length; ++z) {
-            DBProjectFile projectFile = target.db.files.get((byFiles[z++]).replace("/", "\\"));
-            String[] inFile = byFiles[z].split(" ");
-            for (int k = 0; k < (inFile.length / 2) * 2; k += 2) {
-                int line = Integer.parseInt(inFile[k]);
-                long execution = Long.parseLong(inFile[k + 1]);
-
-                if (line > 0) {
-                    int v_line = line - 1;
-                    if (!projectFile.gcov_info.line_info.containsKey(v_line)) {
-                        projectFile.gcov_info.add_line(v_line,
-                                (execution >= 0) ? execution : 0);
-                    }
-                }
-            }
-            //завешение настроек.
-            projectFile.gcov_info.setup();
-        }
-         */
     }
     @Override
     public void Reset() {
@@ -113,4 +96,8 @@ public class SPF_GetGCovInfo extends SilentSapforPass {
         if (Global.mainModule.HasFile())
             Global.mainModule.getFile().form.FocusGCOVLog();
     }
+    @Override
+    protected boolean isGoodCode() {
+        return sapfor.getErrorCode() > 0;
+    }
 }
diff --git a/src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java b/src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java
index 15f12d26..43638fd9 100644
--- a/src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java
+++ b/src/_VisualDVM/ProjectData/SapforData/GCOV/GCOVJson.java
@@ -5,5 +5,5 @@ import java.util.List;
 import java.util.Vector;
 public class GCOVJson {
     @Expose
-    public List<FileGCOVJson> allGCOV= new Vector<>();
+    public List<FileGCOVJson> allGCov= new Vector<>();
 }