benelux 0.5.1 → 0.5.2

data/CHANGES.txt

@@ -1,5 +1,11 @@
 BENELUX, CHANGES
 
+#### 0.5.2 (2009-11-02) ###############################
+
+* ADDED: Selectable#rfilter
+* ADDED: Timeline#messages
+
+
 #### 0.5.1 (2009-10-29) ###############################
 
 * FIXED: Timeline#clear

data/README.rdoc

@@ -1,12 +1,14 @@
-= Benelux v0.4 (IN PROGRESS)
+= Benelux v0.5
 
-<b>A madhouse of timers for your Ruby codes</b>
+<b>A mad timeline for your Ruby codes</b>
 
 
 == Features
 
 * Create timers for any Ruby method
+* Store arbitrary messages
 * Granular statistics
+* Thread-safe
 
 
 == Installation
@@ -32,7 +34,7 @@ Get it in one of the following ways:
 == Thanks 
 
 * Alexis Sellier for fielding my Ruby questions
-* Tara Dougans for the motivational speaches
+* Tara Dougans for the motivational speeches
 
 
 == License

data/benelux.gemspec

@@ -1,8 +1,8 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.5.1"
-  s.summary = "Benelux: Little freakin' timers for your Ruby codes"
+  s.version = "0.5.2"
+  s.summary = "Benelux: A mad timeline for Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
   s.email = "delano@solutious.com"
@@ -29,7 +29,6 @@
   lib/benelux/mixins/thread.rb
   lib/benelux/packer.rb
   lib/benelux/range.rb
-  lib/benelux/reporter.rb
   lib/benelux/stats.rb
   lib/benelux/timeline.rb
   lib/benelux/track.rb

data/lib/benelux.rb

@@ -5,7 +5,7 @@ require 'thwait'
 require 'selectable'
 
 module Benelux
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end
@@ -76,7 +76,8 @@ module Benelux
   end
   Benelux.current_track :main
   
-  # Only updates data from threads that are dead
+  # Only updates data from threads that 
+  # are dead and rotated timelines.
   def Benelux.update_global_timeline
     @@mutex.synchronize do
       dthreads = Benelux.known_threads.select { |t| 

data/lib/benelux/timeline.rb

@@ -21,6 +21,7 @@ module Benelux
     include Selectable
     attr_accessor :ranges
     attr_accessor :stats
+    attr_accessor :messages
     attr_accessor :default_tags
     attr_reader :caller
     def initialize(*args)
@@ -28,6 +29,7 @@ module Benelux
       @ranges = SelectableArray.new
       @default_tags = Selectable::Tags.new
       @stats = Benelux::Stats.new
+      @messages = SelectableArray.new
       add_default_tag :thread_id => Thread.current.object_id.abs
       super
     end
@@ -81,6 +83,7 @@ module Benelux
         next unless stat.tags >= tags
         stats += stat
       end
+      tl.messages = messages
       tl.stats = stats
       tl
     end
@@ -121,12 +124,28 @@ module Benelux
       end
     end
     
+    def messages(tags=Selectable::Tags.new)
+      ret = @messages.select do |msg| 
+        (tags.nil? || msg.tags >= tags)
+      end
+      SelectableArray.new ret
+    end
+    
     def clear
       @ranges.clear
       @stats.clear
+      @messages.clear
       super
     end
     
+    def add_message(str, tags={})
+      msg = TaggableString.new str
+      msg.add_tags self.default_tags
+      msg.add_tags tags
+      @messages << msg
+      msg
+    end
+    
     def add_count(name, count, tags={})
       tags = tags.merge self.default_tags
       self.stats.add_group(name)
@@ -155,16 +174,18 @@ module Benelux
     def merge!(*timelines)
       timelines.each do |tl| 
         self.push *tl
-        self.ranges.push *tl.ranges
-        self.stats += tl.stats
+        @ranges.push *tl.ranges
+        @messages.push *tl.messages
+        @stats += tl.stats
       end
       self
     end
     
     def +(other)
       self.push *other
-      self.ranges.push *other.ranges
-      self.stats += other.stats
+      @ranges.push *other.ranges
+      @messages.push *tl.messages
+      @stats += other.stats
       self
     end
     # Needs to compare thread id and call id. 

data/lib/selectable.rb

@@ -51,8 +51,15 @@ module Selectable
     items = self.select { |obj| obj.tags >= tags }
     self.class.new items
   end  
-    
-
+  
+  # Reverse filter. 
+  def rfilter(*tags)
+    tags = Selectable.normalize tags
+    # select returns an Array. We want a Selectable.
+    items = self.select { |obj| obj.tags < tags }
+    self.class.new items
+  end
+  
   def filter!(*tags)
     tags = Selectable.normalize tags
     self.delete_if { |obj|   obj.tags < tags }
@@ -77,3 +84,7 @@ end
 class SelectableHash < Hash
   include Selectable
 end
+
+class TaggableString < String
+  include Selectable::Object
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -04:00
+date: 2009-11-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: "Benelux: Little freakin' timers for your Ruby codes"
+description: "Benelux: A mad timeline for Ruby codes"
 email: delano@solutious.com
 executables: []
 
@@ -44,7 +44,6 @@ files:
 - lib/benelux/mixins/thread.rb
 - lib/benelux/packer.rb
 - lib/benelux/range.rb
-- lib/benelux/reporter.rb
 - lib/benelux/stats.rb
 - lib/benelux/timeline.rb
 - lib/benelux/track.rb
@@ -69,7 +68,7 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --title
-- "Benelux: Little freakin' timers for your Ruby codes"
+- "Benelux: A mad timeline for Ruby codes"
 - --main
 - README.rdoc
 require_paths: 
@@ -89,9 +88,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: benelux
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: "Benelux: Little freakin' timers for your Ruby codes"
+summary: "Benelux: A mad timeline for Ruby codes"
 test_files: []
 

data/lib/benelux/reporter.rb

@@ -1,93 +0,0 @@
-
-module Benelux
-  class Reporter
-    attr_reader :thread
-    attr_reader :thwait
-    @@mutex = Mutex.new
-    def initialize(*threads)
-      @thwait = ThreadsWait.new
-      @abort, @running = false, false
-      @tmerge = Benelux::Stats::Calculator.new
-      add_threads *threads
-      @tbd = []
-      @thread = create_reporting_thread
-    end
-    def create_reporting_thread(priority=-3)
-      t = Thread.new do
-        5.times {  # Give the app 1 second to generate threads
-          break if @start && !@thwait.empty?
-          sleep 0.2
-        }
-        
-        run_loop
-      end
-      t.priority = priority
-      t
-    end
-    def add_threads(*threads)
-      threads.each do |thread|
-        raise BadRecursion, "Cannot report on self" if thread == @thread
-        next if thread == Thread.main
-        @thwait.join_nowait thread
-      end
-      @start = true
-    end
-    alias_method :add_thread, :add_threads
-    def running_threads?
-      # Any status that is not nil or false is running
-      !@thwait.threads.select { |t| !t.nil? && t.status }.empty?
-    end
-
-    def run_loop
-      loop do
-        break if @abort
-        process(@tbd)
-        if @thwait.empty?
-          sleep 0.01 # prevent mad thrashing. 
-          # If there are no threads running we can stop 
-          # because there are none waiting in the queue. 
-          running_threads? ? next : break
-        end
-        t = @thwait.next_wait
-        @tbd << t.timeline
-      end
-    end
-    def process(tbd)
-      return if tbd.empty?
-      (start = Time.now)
-      Benelux.timeline.merge! *tbd
-      (endt = Time.now)
-      dur = (endt - start).to_f
-      #p [:processed, tbd.size, dur]
-      tbd.clear
-      @tmerge.sample dur
-    end
-    # We don't add the main thread to the wait group
-    # so we need to manually force processing for
-    # that thread.
-    def force_update
-      @abort = false
-      @tbd << Thread.current.timeline
-      run_loop
-    end
-    # Call this once the active threads have stopped. It
-    # increases the priority of the processing thread, 
-    # waits for it to finish and then calls force_update
-    # to get the main threads stats into the timeline. 
-    def wait
-      if @thread && Thread.current == Thread.main
-        @abort = true
-        @thread.priority = 0
-        @thread.join if @thread.status
-        force_update
-      else
-        msg = "Not main thread. Skipping call to wait from #{caller[0]}"
-        Benelux.ld msg
-      end
-    end
-    def stop() @abort = true end
-    def done?()     @done  end
-    def aborted?()  @abort end
-    def running?()  @running end
-  end
-end