sampling_prof 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 6e74f789ae7dba019462c771325081151d194206
-  data.tar.gz: 00ee209871452f5fa34f62e973db2d801e6e27b2
+  metadata.gz: 3d1357aece706366d12fac2c1670ded8f2bdd24f
+  data.tar.gz: 12077ea8a42b5ca17c38df2875aab9c6234e9955
 SHA512: 
-  metadata.gz: eda0c06539ea65d5a9159cbee26b047f123fd73142cbff761f7b665d90cd97e81ae12fb4718698a86b584a9787f5d02186d3f4eae323468faf4405eb8eb8bb05
-  data.tar.gz: b3a9f7a9900abd607deb03b669b5721b01a81f3ad2f81cb71ee241e3630ea46c622782786f76af53c34eea34a1ec6fc2b80d641e838a99c4cfd2d99d359e9e46
+  metadata.gz: 4fd426493b203256f040399daf7e3c69e3ce44b5428d420b6d70900036cc3cd5d8910d5f2e6d16c7db5ee40894ed4f8f156a5749fd23676cb6b9055bed166586
+  data.tar.gz: 65c57574670f4385e0b9f68a994bc33c01766e18b4025ee768292a22a8954662e7cc58f2267dcfc9b276f8f7856f3860c9b4f77be10ef0c51ad1813a7bad01bd

data/lib/sampling_prof.rb

@@ -9,6 +9,17 @@ class SamplingProf
 
   attr_writer :output_file
 
+  def initialize(sampling_interval=0.1,
+                 multithreading=false,
+                 output_interval=nil, #sec
+                 &output_handler)
+    self.sampling_interval = sampling_interval
+    self.multithreading = multithreading
+    self.output_interval = output_interval || (multithreading ? 60 : nil)
+    self.output_handler = block_given? ? output_handler : default_output_handler
+    internal_initialize if respond_to?(:internal_initialize)
+  end
+
   def output_file
     @output_file ||= DEFAULT_OUTPUT_FILE
   end
@@ -20,28 +31,10 @@ class SamplingProf
     stop if block_given?
   end
 
-  def start(handler=default_output_handler)
-    __start__(&handler)
-  end
-
   def default_output_handler
     lambda do |data|
-      nodes, counts, call_graph = data
       File.open(output_file, 'w') do |f|
-        nodes.each do |node|
-          # node name, node id
-          f.puts node.join(',')
-        end
-        f.puts ""
-        counts.each do |count|
-          # node id, count
-          f.puts count.flatten.join(",")
-        end
-        f.puts ""
-        call_graph.each do |v|
-          # from node id, to node id, count
-          f.puts v.flatten.join(",")
-        end
+        f.write(data)
       end
     end
   end

data/lib/sampling_prof/internal.rb

@@ -1,40 +1,47 @@
+require 'set'
+require 'thread'
 
 class SamplingProf
-  class Sample < Struct.new(:self, :total)
-  end
-
   class Sampling
-    def initialize
+    def initialize(threads)
       @samples = Hash.new{|h,k| h[k] = [0, 0] }
       @call_graph = Hash.new{|h,k| h[k] = 0}
       @nodes = {}
+      @threads = threads
     end
 
     def result
-      [@nodes.to_a, @samples.to_a, @call_graph.to_a]
+      ret = []
+      ret << @nodes.map {|node| node.join(',')}.join("\n")
+      ret << @samples.map {|count| count.flatten.join(',')}.join("\n")
+      ret << @call_graph.map {|v| v.flatten.join(',')}.join("\n")
+      "#{ret.join("\n\n")}\n"
     end
 
-    def process(locations)
-      from = -1
-      paths = []
-      calls = []
-      top_index = locations.size - 1
-      locations.reverse.each_with_index do |loc, i|
-        node_id = node_id(loc)
-        if i == top_index
-          @samples[node_id][0] += 1
-        end
+    def process
+      @threads.each do |thread|
+        locations = thread.backtrace_locations
+        from = -1
+        paths = []
+        calls = []
+        top_index = locations.size - 1
+        locations.reverse.each_with_index do |loc, i|
+          node_id = node_id(loc)
+          if i == top_index
+            @samples[node_id][0] += 1
+          end
 
-        path = [from, node_id]
-        if !paths.include?(path)
-          paths << path
-          @call_graph[path] += 1
-        end
-        if !calls.include?(node_id)
-          calls << node_id
-          @samples[node_id][1] += 1
+          path = [from, node_id]
+          if !paths.include?(path)
+            paths << path
+            @call_graph[path] += 1
+          end
+          if !calls.include?(node_id)
+            calls << node_id
+            @samples[node_id][1] += 1
+          end
+          from = node_id
         end
-        from = node_id
       end
     end
 
@@ -47,24 +54,56 @@ class SamplingProf
     end
   end
 
-  def initialize(period)
-    @period = period
+  class Threads
+    def initialize
+      @set = Set.new
+      @mutex = Mutex.new
+    end
+
+    def each(&block)
+      dup.each(&block)
+    end
+
+    def dup
+      @mutex.synchronize { @set.dup }
+    end
+
+    def add(obj)
+      @mutex.synchronize { @set.add(obj) }
+    end
+
+    def delete(obj)
+      @mutex.synchronize { @set.delete(obj) }
+    end
+  end
+
+  attr_accessor :sampling_interval, :multithreading, :output_interval, :output_handler
+
+  def internal_initialize
     @running = false
     @sampling_thread = nil
+    @threads = Threads.new
   end
 
-  def __start__(&block)
-    unless @running
+  def start
+    if @multithreading || !@running
       @running = true
-      target = Thread.current
-      @sampling_thread = Thread.start do
-        sampling = Sampling.new
+      @threads.add(Thread.current)
+      @sampling_thread ||= Thread.start do
         loop do
+          sampling = Sampling.new(@threads)
+          start_time = Time.now
+          loop do
+            break unless @running
+            if @multithreading
+              break if output_interval < (Time.now - start_time)
+            end
+            sampling.process
+            sleep @sampling_interval
+          end
+          @output_handler.call(sampling.result)
           break unless @running
-          sampling.process(target.backtrace_locations)
-          sleep @period
         end
-        block.call(sampling.result)
       end
       true
     end
@@ -72,13 +111,22 @@ class SamplingProf
 
   def stop
     if @running
-      @running = false
-      @sampling_thread.join
-      @sampling_thread = nil
+      if @multithreading
+        @threads.delete(Thread.current)
+      else
+        terminate
+      end
       true
     end
   end
 
+  def terminate
+    @running = false
+    @sampling_thread.join
+    @sampling_thread = nil
+    true
+  end
+
   def profiling?
     !!@sampling_thread
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sampling_prof
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
   - Xiao Li
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-22 00:00:00 Z
+date: 2014-03-23 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake-compiler