roby 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.7.2
+
+* fixed a memory leak regarding the event propagation histories. Until now,
+  all the propagation histories where kept through Event#sources, leading to
+  actually keeping most plan objects since the beginning of execution. This
+  is fixed by internally using weak references. Histories will therefore be
+  truncated as the Ruby GC removes references to the concerned plan objects.
+* misc small fixes, which mostly remove some false negatives in the test suite
+* small change to be compatible with 1.8.7
+
 === 0.7.1
 
 * Fixed extension handling in 'rake setup'. It should work again.

data/Rakefile

@@ -15,7 +15,7 @@ begin
             p.changes     = p.paragraphs_of('History.txt', 0..1).join("\n\n")
             p.post_install_message = p.paragraphs_of('README.txt', 2).join("\n\n")
 
-            p.extra_deps << ['facets', '>= 2.0'] << 'activesupport' << ['utilrb', '1.2']
+            p.extra_deps << ['facets', '>= 2.0'] << 'activesupport' << ['utilrb', '>= 1.3.1']
             if p.respond_to? :need_rdoc=
                 p.need_rdoc = false
             end

data/lib/roby.rb

@@ -39,3 +39,4 @@ require 'roby/interface'
 require 'roby/distributed/protocol'
 
 require 'roby/app'
+

data/lib/roby/config.rb

@@ -1,5 +1,14 @@
+if RUBY_VERSION >= "1.9"
+    STDERR.puts <<-EOB
+The stable version of Roby is not compatible with 1.9. If you really want to
+try it on 1.9, checkout the 1.9 branch of the development repository on github
+(see README.txt for URLs)
+    EOB
+    exit(1)
+end
+
 module Roby
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
     ROBY_LIB_DIR  = File.expand_path( File.join(File.dirname(__FILE__), '..') )
     ROBY_ROOT_DIR = File.expand_path( File.join(ROBY_LIB_DIR, '..') )
 end

data/lib/roby/control.rb

@@ -492,7 +492,6 @@ module Roby
 			cv.wait(mt)
 		    end
 		end
-		raise unless @thread
 		return
 	    end
 

data/lib/roby/distributed/connection_space.rb

@@ -265,7 +265,10 @@ module Roby
 			    while !pending_sockets.empty?
 				socket, peer = pending_sockets.shift
 				sockets[socket] = peer
-				Roby::Distributed.info "listening to #{socket.peer_info} for #{peer}"
+                                begin
+                                    Roby::Distributed.info "listening to #{socket.peer_info} for #{peer}"
+                                rescue IOError
+                                end
 			    end
 
 			    begin
@@ -282,18 +285,22 @@ module Roby
 				    next
 				end
 
-				header = socket.read(8)
-				unless header && header.size == 8
-				    closed_sockets << socket
-				    next
-				end
-
-				id, size = header.unpack("NN")
-				data     = socket.read(size)
-
-				p = sockets[socket]
-				p.stats.rx += (size + 8)
-				Roby::Distributed.cycles_rx << [p, Marshal.load(data)]
+                                begin
+                                    header = socket.read(8)
+                                    unless header && header.size == 8
+                                        closed_sockets << socket
+                                        next
+                                    end
+
+                                    id, size = header.unpack("NN")
+                                    data     = socket.read(size)
+
+                                    p = sockets[socket]
+                                    p.stats.rx += (size + 8)
+                                    Roby::Distributed.cycles_rx << [p, Marshal.load(data)]
+                                rescue Errno::ECONNRESET, IOError
+                                    closed_sockets << socket
+                                end
 			    end
 
 			    for socket in closed_sockets

data/lib/roby/event.rb

@@ -1,3 +1,4 @@
+require 'utilrb/weakref'
 require 'roby/plan-object'
 require 'roby/exceptions'
 require 'set'
@@ -11,14 +12,42 @@ module Roby
         # The generator which emitted this event
 	attr_reader :generator
 
+        @@creation_places = Hash.new
 	def initialize(generator, propagation_id, context, time = Time.now)
 	    @generator, @propagation_id, @context, @time = generator, propagation_id, context.freeze, time
+
+            @@creation_places[object_id] = "#{generator.class}"
 	end
 
 	attr_accessor :propagation_id, :context, :time
-	attr_accessor :sources
 	protected :propagation_id=, :context=, :time=
 
+        # The events whose emission triggered this event during the
+        # propagation. The events in this set are subject to Ruby's own
+        # garbage collection, which means that if a source event is garbage
+        # collected (i.e. if all references to the associated task/event
+        # generator are removed), it will be removed from this set as well.
+        def sources
+            result = []
+            @sources.delete_if do |ref|
+                begin 
+                    result << ref.get
+                    false
+                rescue Utilrb::WeakRef::RefError
+                    true
+                end
+            end
+            result
+        end
+
+        # Sets the sources. See #sources
+        def sources=(sources) # :nodoc:
+            @sources = ValueSet.new
+            for s in sources
+                @sources << Utilrb::WeakRef.new(s)
+            end
+        end
+
 	# To be used in the event generators ::new methods, when we need to reemit
 	# an event while changing its 
 	def reemit(new_id, new_context = nil)
@@ -35,7 +64,9 @@ module Roby
 
 	def name; model.name end
 	def model; self.class end
-	def inspect; "#<#{model.to_s}:0x#{address.to_s(16)} generator=#{generator} model=#{model}" end
+	def inspect # :nodoc:
+            "#<#{model.to_s}:0x#{address.to_s(16)} generator=#{generator} model=#{model}"
+        end
 
         # Returns an event generator which will be emitted once +time+ seconds
         # after this event has been emitted.
@@ -43,10 +74,11 @@ module Roby
             State.at :t => (self.time + time)
         end
 
-	def to_s
+	def to_s # :nodoc:
 	    "[#{time.to_hms} @#{propagation_id}] #{self.class.to_s}: #{context}"
 	end
-        def pretty_print(pp)
+
+        def pretty_print(pp) # :nodoc:
             pp.text "[#{time.to_hms} @#{propagation_id}] #{self.class}"
             if context
                 pp.breakable
@@ -691,6 +723,8 @@ module Roby
 	    return if @unreachable
 	    @unreachable = true
 
+            EventGenerator.event_gathering.delete(self)
+
 	    unreachable_handlers.each do |_, block|
 		begin
 		    block.call(reason)

data/lib/roby/state/state.rb

@@ -217,9 +217,23 @@ module Roby
 	# Returns true if this object has no member
 	def empty?; @members.empty? end
 
-        def respond_to?(name) # :nodoc:
-            return true  if super
+        if RUBY_VERSION >= "1.8.7"
+            def respond_to?(name, include_private = false) # :nodoc:
+                return true  if super
+                return __respond_to__(name)
+            end
+        else
+            def respond_to?(name) # :nodoc:
+                return true  if super
+                return __respond_to__(name)
+            end
+        end
+
 
+        # 1.8.7's #respond_to? takes two arguments, 1.8.6 only one. This is the
+        # common implementation for both version. #respond_to? is adapted (see
+        # above)
+        def __respond_to__(name) # :nodoc:
             name = name.to_s
 	    return false if name =~ FORBIDDEN_NAMES_RX
 

data/lib/roby/task.rb

@@ -56,14 +56,13 @@ module Roby
 	# event
 	def task_sources
 	    result = ValueSet.new
-	    if sources
-		for ev in sources
-		    gen = ev.generator
-		    if gen.respond_to?(:task) && gen.task == task
-			result.merge ev.task_sources
-		    end
-		end
-	    end
+	    event_sources = sources
+            for ev in event_sources
+                gen = ev.generator
+                if gen.respond_to?(:task) && gen.task == task
+                    result.merge ev.task_sources
+                end
+            end
 	    if result.empty?
 		result << self
 	    end

data/test/test_event.rb

@@ -764,6 +764,7 @@ class TC_Event < Test::Unit::TestCase
 	# removed from the plan
 	collection.clear
 	plan.remove_object(e1)
+        assert(!EventGenerator.event_gathering.has_key?(e1))
 
 	EventGenerator.remove_event_gathering(collection)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roby
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 +02:00
+date: 2008-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.2"
+        version: 1.3.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe