benelux 0.5.2 → 0.5.3

data/CHANGES.txt

@@ -1,5 +1,12 @@
 BENELUX, CHANGES
 
+
+#### 0.5.3 (2009-11-16) ###############################
+
+* FIXED: Process dead threads only once
+* FIXED: Copy default tags when rotating timelines
+
+
 #### 0.5.2 (2009-11-02) ###############################
 
 * ADDED: Selectable#rfilter

data/benelux.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.5.2"
+  s.version = "0.5.3"
   s.summary = "Benelux: A mad timeline for Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"

data/lib/benelux.rb

@@ -5,7 +5,7 @@ require 'thwait'
 require 'selectable'
 
 module Benelux
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end
@@ -34,6 +34,7 @@ module Benelux
   @tracks = SelectableHash.new
   @timeline = Timeline.new
   @known_threads = []
+  @processed_dead_threads = []
   
   @@mutex = Mutex.new
   @@debug = false
@@ -81,7 +82,8 @@ module Benelux
   def Benelux.update_global_timeline
     @@mutex.synchronize do
       dthreads = Benelux.known_threads.select { |t| 
-        !t.timeline.nil? && (t.nil? || !t.status)
+        !t.timeline.nil? && (t.nil? || !t.status) &&
+        !@processed_dead_threads.member?(t)
       }
       # Threads that have rotated timelines
       rthreads = Benelux.known_threads.select { |t|
@@ -96,7 +98,9 @@ module Benelux
           dtimelines.push t.rotated_timelines.shift 
         end
       }
+      Benelux.ld [:update_global_timeline, dthreads.size, rthreads.size, dtimelines.size].inspect
       tl = Benelux.timeline.merge! *dtimelines
+      @processed_dead_threads.push *dthreads
       tl
     end
   end

data/lib/benelux/mixins/thread.rb

@@ -6,9 +6,10 @@ class Thread
   attic :track_name
   attic :rotated_timelines
   def rotate_timeline
-    prev = self.timeline
+    self.rotated_timelines << self.timeline
+    tags = self.timeline.default_tags.clone
     self.timeline = Benelux::Timeline.new
-    self.rotated_timelines << prev
+    self.timeline.default_tags = tags
     self.timeline
   end
 end

data/lib/benelux/packer.rb

@@ -125,7 +125,7 @@ module Benelux
         cmd = Benelux.packed_method #{@klass}, :#{@meth}
         ret = #{@aliaz}(*args, &block)
         count = cmd.determine_count(args, ret)
-        Benelux.ld "COUNT(:#{@meth}): \#{count}"
+        #Benelux.ld "COUNT(:#{@meth}): \#{count}"
         Benelux.thread_timeline.add_count :'#{@meth}', count
         ret
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -05:00
+date: 2009-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency