test-prof-autopilot 0.1.0.pre.1 → 0.1.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55e6d41b4c30aa3390d97e550a425e92125e6ee74e4ffe6a3e2660be5f5e1795
-  data.tar.gz: 866cc0632a7304a5e675ae78541e77f304de4eeba781f8987a6f8d0563eba3db
+  metadata.gz: 8ee9039d6d83bbf54010e2ebda79747d5ad7511cb7cff65eb1d1064f72561692
+  data.tar.gz: fc3b28fc007dcfefddf66dd4b045befb745db2aa3dc09ca591ae3a75cee45b73
 SHA512:
-  metadata.gz: 2ffc441d899c9fa8c2fcaec24930016ee0677705153dd4528aa19e9b48637563a06a0573e001c069d2f04ef5cf4964a49f6380afaefbb263c7b66b0ae8673b19
-  data.tar.gz: 389c5d56dbdc4553d21850f964d5880c0de8a2cde0c9938c65a390de84556b326d3abf8cdc71ad5626461e572e7021697f2272edeb8e34ac1a427f632fafa6f4
+  metadata.gz: 9540aa726621514223f0f48a02b27e13c1082b27596093d610b19fd0d885dcb416f6336c03e631fb4d51a10ea57a21ccbb671312b0ca9a02a36a8e73c5225412
+  data.tar.gz: 6d16c822426a62e6ac7ad8d8a0d747d0e61e2850e23252ec9b9753f5ec735cb9b64ff28bb5e071614359a04314ba8eff25d08eb433e4319bfbd53337562808ce

data/lib/test_prof/autopilot/stack_prof/report.rb

@@ -24,32 +24,53 @@ module TestProf
         end
 
         def merge(other)
-          f1, f2 = data[:frames], other.data[:frames]
-
-          frames = (f1.keys + f2.keys).uniq.each_with_object({}) do |id, hash|
-            if f1[id].nil?
-              hash[id] = f2[id]
-            elsif f2[id]
-              hash[id] = f1[id]
-              hash[id][:total_samples] += f2[id][:total_samples]
-              hash[id][:samples] += f2[id][:samples]
-              if f2[id][:edges]
-                edges = hash[id][:edges] ||= {}
-                f2[id][:edges].each do |edge, weight|
-                  edges[edge] ||= 0
-                  edges[edge] += weight
-                end
+          ids_mapping = generate_ids_mapping(data[:frames], other.data[:frames])
+
+          frames = data[:frames].dup
+
+          other.data[:frames].each do |id, new_frame|
+            frame =
+              if ids_mapping[id]
+                frames[ids_mapping[id]]
+              else
+                frames[id] = empty_frame_from(new_frame)
               end
-              if f2[id][:lines]
-                lines = hash[id][:lines] ||= {}
-                f2[id][:lines].each do |line, weight|
-                  lines[line] = add_lines(lines[line], weight)
+
+            frame[:total_samples] += new_frame[:total_samples]
+            frame[:samples] += new_frame[:samples]
+
+            if new_frame[:edges]
+              edges = (frame[:edges] ||= {})
+
+              new_frame[:edges].each do |edge, weight|
+                old_edge = ids_mapping[edge]
+
+                if edges[old_edge]
+                  edges[old_edge] += weight
+                else
+                  edges[old_edge] = weight
                 end
               end
-            else
-              hash[id] = f1[id]
             end
-            hash
+
+            if new_frame[:lines]
+              lines = (frame[:lines] ||= {})
+
+              new_frame[:lines].each do |line, weight|
+                old_line = ids_mapping[line]
+
+                lines[old_line] =
+                  if lines[old_line]
+                    add_lines(lines[old_line], weight)
+                  else
+                    weight
+                  end
+              end
+            end
+          end
+
+          converted_raw = other.data[:raw].map do |raw|
+            ids_mapping[raw] || raw
           end
 
           d1, d2 = data, other.data
@@ -62,12 +83,38 @@ module TestProf
             missed_samples: d1[:missed_samples] + d2[:missed_samples],
             metadata: d1[:metadata].merge(d2[:metadata]),
             frames: frames,
-            raw: d1[:raw] + d2[:raw],
+            raw: d1[:raw] + converted_raw,
             raw_timestamp_deltas: d1[:raw_timestamp_deltas] + d2[:raw_timestamp_deltas]
           }
 
           self.class.new(data)
         end
+
+        def generate_ids_mapping(frames, other_frames)
+          old_fingerprints = frames_to_fingerprints(frames)
+          new_fingerprints = frames_to_fingerprints(other_frames)
+
+          new_fingerprints.each_with_object({}) do |(fingerprint, frame), hash|
+            next hash unless old_fingerprints[fingerprint]
+
+            hash[frame[:id]] = old_fingerprints[fingerprint][:id]
+          end
+        end
+
+        def frames_to_fingerprints(frames)
+          frames.each_with_object({}) do |(id, frame), hash|
+            fingerprint = [frame[:name], frame[:file], frame[:line]].compact.map(&:to_s).join("/")
+            hash[fingerprint] = frame.merge(id: id)
+            hash
+          end
+        end
+
+        def empty_frame_from(frame)
+          frame.slice(:name, :file, :line).merge(
+            total_samples: 0,
+            samples: 0
+          )
+        end
       end
     end
   end

data/lib/test_prof/autopilot/version.rb

@@ -2,6 +2,6 @@
 
 module TestProf
   module Autopilot # :nodoc:
-    VERSION = "0.1.0.pre.1"
+    VERSION = "0.1.0.pre.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-prof-autopilot
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.1
+  version: 0.1.0.pre.2
 platform: ruby
 authors:
 - Ruslan Shakirov