dwarftree 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc07b0f8ac78b5bc79d5b961c13bd85a17f8560a1bba4de668a16c61c59b8e50
-  data.tar.gz: 9d065ba961225885c646be8727506011b52da34aa5921009d8f97b4e858b4723
+  metadata.gz: 7ca6679b550fa279774d1d4b83ed090a970ece0114214eca60778af139f826ce
+  data.tar.gz: 65f1faa1444db68193f911e6bfbbc767e37215aa6ca5e3cd2eb34a653ba6218b
 SHA512:
-  metadata.gz: 55d33ac42c431d22105aae69c5c003923f102dead9054bf33820365126056a0125a9a46e6ea07d0ed002f7b0e7b84f2b9ffe2d3a7d56a29e1d229aabeee60a8e
-  data.tar.gz: 45a2501201183a1d49a211f6b9d089462c8f6899706a5066ea134fd3d3af130f61552172c81b83c29196791962bd56ec3f7b663f4755771b383563011ba13cc0
+  metadata.gz: 69b8bb1233adbe80b18e1b54f2f41f64b7e6af23e36b8191ac7c37b034ad5d6d02117161e93f6b2499352b37372a2798ab94e904a98f1a52bbea6f3dd542003e
+  data.tar.gz: c538f326be28b0deb95c5cfbdc5849c6bf3ab51562aff3dfc5ae49aa64a46512af12228b992da4918aa8b208d613f3eb615920e767da08922853c4dd0e643c11

data/CHANGELOG.md

@@ -1,8 +1,11 @@
+## v0.1.2
+
+* Add `--merge` option
+
 ## v0.1.1
 
 * Add `--flat` option
 
 ## v0.1.0
 
-* Initial release
-  * Features: `--die`, `--subprogram`, `--show-size`, `--sort-size`
+* Add `--die`, `--subprogram`, `--show-size`, `--sort-size` options

data/exe/dwarftree

@@ -8,6 +8,7 @@ subprograms = Set.new
 dies = Set.new
 show_size = false
 sort_size = false
+merge = false
 flat = false
 
 objects = OptionParser.new do |o|
@@ -25,11 +26,23 @@ objects = OptionParser.new do |o|
     show_size = true
     sort_size = true
   end
+  o.on('--merge', 'Merge sibling DIEs with the same attributes') do
+    show_size = true
+    merge = true
+  end
   o.on('--flat', 'Skip constructing a tree') do
     flat = true
   end
 end.parse!(ARGV)
 
 objects.each do |object|
-  Dwarftree.run(object, dies: dies, subprograms: subprograms, show_size: show_size, sort_size: sort_size, flat: flat)
+  Dwarftree.run(
+    object,
+    dies: dies,
+    subprograms: subprograms,
+    show_size: show_size,
+    sort_size: sort_size,
+    merge: merge,
+    flat: flat,
+  )
 end

data/lib/dwarftree/die.rb

@@ -29,11 +29,22 @@ module Dwarftree::DIE
       self.attributes = members
 
       # Not in members to avoid a conflict with DIE attributes
-      attr_accessor :type, :level, :children
+      attr_accessor :type, :level, :children, :merged
 
       def initialize(**)
         super
         self.children = []
+        self.merged = []
+      end
+
+      def attributes
+        attrs = {}
+        self.class.attributes.each do |attr|
+          if value = send(attr)
+            attrs[attr] = value
+          end
+        end
+        attrs
       end
 
       if block

data/lib/dwarftree/tree_merger.rb

@@ -0,0 +1,19 @@
+class << Dwarftree::TreeMerger = Object.new
+  # @param [Array<Dwarftree::DIE::*>] nodes
+  def merge!(nodes)
+    merged = []
+    nodes.group_by(&:attributes).each do |attrs, same_nodes|
+      first_node = same_nodes.first
+      same_nodes.drop(1).each do |node|
+        first_node.children.push(*node.children)
+        first_node.merged << node
+      end
+      merged << first_node
+    end
+    nodes.replace(merged)
+
+    nodes.each do |node|
+      merge!(node.children)
+    end
+  end
+end

data/lib/dwarftree/tree_visualizer.rb

@@ -22,7 +22,7 @@ class Dwarftree::TreeVisualizer
   def visualize_node(node, depth: 0)
     size = node_code_size(node)
     print "#{'  ' * depth}#{node.type}"
-    puts "#{(" size=#{human_size(size)}" if @show_size && size)} #{node_attributes(node)}"
+    puts "#{(" size=#{human_size(size)}" if @show_size && size > 0)} #{node_attributes(node)}"
 
     sort(node.children).each do |child|
       visualize_node(child, depth: depth + 1)
@@ -30,23 +30,21 @@ class Dwarftree::TreeVisualizer
   end
 
   def node_attributes(node)
-    attrs = node.class.attributes.map do |attr|
-      if value = node.public_send(attr)
-        "#{attr}: #{value}"
-      end
+    attrs = node.attributes.map do |attr, value|
+      "#{attr}: #{value}"
     end
-    attrs.compact!
-
     return '' if attrs.empty?
     "(#{attrs.join(', ')})"
   end
 
   def node_code_size(node)
+    size = node.merged.map { |n| node_code_size(n) }.compact.sum
     if node.respond_to?(:ranges) && node.ranges
-      node.ranges.map { |range| range.end - range.begin }.sum
+      size += node.ranges.map { |range| range.end - range.begin }.sum
     elsif node.respond_to?(:high_pc) && node.high_pc
-      node.high_pc.to_i(16) # surprisingly low_pc is not needed to know code size
+      size += node.high_pc.to_i(16) # surprisingly low_pc is not needed to know code size
     end
+    size
   end
 
   def human_size(size)

data/lib/dwarftree/version.rb

@@ -1,3 +1,3 @@
 module Dwarftree
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/dwarftree.rb

@@ -1,6 +1,7 @@
 module Dwarftree
   require 'dwarftree/debug_info_parser'
   require 'dwarftree/tree_filter'
+  require 'dwarftree/tree_merger'
   require 'dwarftree/tree_visualizer'
 
   # @param [String] object
@@ -8,8 +9,9 @@ module Dwarftree
   # @param [Array<String>] subprograms
   # @param [TrueClass,FalseClass] show_size
   # @param [TrueClass,FalseClass] sort_size
+  # @param [TrueClass,FalseClass] merge
   # @param [TrueClass,FalseClass] flat
-  def self.run(object, dies:, subprograms:, show_size:, sort_size:, flat:)
+  def self.run(object, dies:, subprograms:, show_size:, sort_size:, merge:, flat:)
     begin
       nodes = DebugInfoParser.parse(object, flat: flat)
     rescue DebugInfoParser::CommandError => e
@@ -20,6 +22,9 @@ module Dwarftree
     end
 
     Dwarftree::TreeFilter.new(dies: dies, subprograms: subprograms).filter!(nodes)
+    if merge
+      Dwarftree::TreeMerger.merge!(nodes)
+    end
     Dwarftree::TreeVisualizer.new(show_size: show_size, sort_size: sort_size).visualize(nodes)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwarftree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -59,6 +59,7 @@ files:
 - lib/dwarftree/die/variable.rb
 - lib/dwarftree/die/volatile_type.rb
 - lib/dwarftree/tree_filter.rb
+- lib/dwarftree/tree_merger.rb
 - lib/dwarftree/tree_visualizer.rb
 - lib/dwarftree/version.rb
 homepage: https://github.com/k0kubun/dwarftree