utilrb 1.6.5 → 1.6.6

data/Manifest.txt

@@ -7,6 +7,7 @@ Rakefile
 bm/allocation.rb
 bm/speed.rb
 ext/extconf.rb
+ext/proc.cc
 ext/ruby_internals-1.8.h
 ext/ruby_internals-1.9.h
 ext/swap.cc
@@ -75,6 +76,7 @@ lib/utilrb/object/singleton_class.rb
 lib/utilrb/objectstats.rb
 lib/utilrb/pkgconfig.rb
 lib/utilrb/rake_common.rb
+lib/utilrb/ruby_object_graph.rb
 lib/utilrb/set.rb
 lib/utilrb/set/to_s.rb
 lib/utilrb/socket/tcp_server.rb

data/ext/proc.cc

@@ -0,0 +1,38 @@
+#ifdef HAS_RUBY_SOURCE
+extern "C" {
+#include "/usr/include/ruby-1.9.1/ruby-1.9.3-p0/vm_core.h"
+}
+
+static VALUE env_references(VALUE rbenv)
+{
+    rb_env_t* env;
+
+    VALUE result = rb_ary_new();
+    GetEnvPtr(rbenv, env);
+    if (env->env)
+    {
+        for (int i = 0; i < env->env_size; ++i)
+            rb_ary_push(result, rb_obj_id(env->env[i]));
+    }
+    return result;
+}
+
+static VALUE proc_references(VALUE rbproc)
+{
+    rb_proc_t* proc;
+    GetProcPtr(rbproc, proc);
+
+    if (!NIL_P(proc->envval))
+        return env_references(proc->envval);
+    return rb_ary_new();
+}
+#else
+#warning "RUBY_SOURCE_DIR is not set, Proc#references will not be available"
+#endif
+
+extern "C" void Init_proc()
+{
+#ifdef HAS_RUBY_SOURCE
+    rb_define_method(rb_cProc, "references", RUBY_METHOD_FUNC(proc_references), 0);
+#endif
+}

data/lib/utilrb/common.rb

@@ -1,6 +1,6 @@
 module Utilrb
     unless defined? Utilrb::VERSION
-	VERSION = "1.6.5"
+	VERSION = "1.6.6"
         RUBY_IS_19  = (RUBY_VERSION >= "1.9.2")
         RUBY_IS_191 = (RUBY_VERSION >= "1.9") && (RUBY_VERSION < "1.9.2")
     end

data/lib/utilrb/configsearch/configuration_finder.rb

@@ -10,8 +10,8 @@ module Utilrb
         # 
         # Returns the path to the file on success, otherwise nil
         def self.findWithEnv(filename, pkg_name, environment_search_path)
-            if environment_search_path
-                env_var = ENV[environment_search_path]
+	    env_var = ENV[environment_search_path]
+            if env_var
                 # Extract search path from environment variable
                 configuration_path = Array.new
                 env_var.split(':').each do | path |

data/lib/utilrb/ruby_object_graph.rb

@@ -0,0 +1,235 @@
+module Utilrb
+    begin
+        require 'roby/graph'
+        has_roby_graph = true
+    rescue LoadError
+        has_roby_graph = false
+    end
+
+    if has_roby_graph
+    class RubyObjectGraph
+        attr_reader :graph
+        attr_reader :references
+
+        def self.snapshot
+            # Doing any Ruby code that do not modify the heap is impossible. List
+            # all existing objects once, and only then do the processing.
+            # +live_objects+ will be referenced in itself, but we are going to
+            # remove it later
+            GC.disable
+            live_objects = []
+            ObjectSpace.each_object do |obj|
+                if obj != live_objects
+                    live_objects << obj
+                end
+            end
+            GC.enable
+        end
+
+        def initialize
+            @graph = BGL::Graph.new
+            @references = Hash.new
+        end
+
+        class ObjectRef
+            attr_reader :obj
+            def initialize(obj)
+                @obj = obj
+            end
+            include BGL::Vertex
+        end
+
+        def test_and_add_reference(obj_ref, var, desc)
+            var_ref = references[var.object_id]
+            if graph.include?(var_ref)
+                add_reference(obj_ref, var_ref, desc)
+            end
+        end
+
+        def add_reference(obj_ref, var_ref, desc)
+            if graph.linked?(obj_ref, var_ref)
+                obj_ref[var_ref, graph] << desc
+            else
+                graph.link(obj_ref, var_ref, [desc].to_set)
+            end
+        end
+
+        def register_references_to(klass, orig_options = Hash.new)
+            options = Kernel.validate_options orig_options,
+                :roots => nil
+            roots = options[:roots]
+
+            live_objects = RubyObjectGraph.snapshot
+
+            # Create a single ObjectRef per (interesting) live object, so that we
+            # can use a BGL::Graph to represent the reference graph.  This will be
+            # what we are going to access later on. Use object IDs since we really
+            # want to refer to objects and not use eql? comparisons
+            desired_seeds = []
+            excludes = [live_objects, self, orig_options, options, roots].to_value_set
+            live_objects.delete_if do |obj|
+                if excludes.include?(obj)
+                    true
+                else
+                    references[obj.object_id] ||= ObjectRef.new(obj)
+                    if obj.kind_of?(klass)
+                        desired_seeds << obj.object_id
+                    end
+                    false
+                end
+            end
+
+            desired_seeds.each do |obj_id|
+                graph.insert(references[obj_id])
+            end
+            ignored_enumeration = Hash.new
+
+            loop do
+                old_graph_size = graph.size
+                live_objects.each do |obj|
+                    obj_ref = references[obj.object_id]
+
+                    test_and_add_reference(obj_ref, obj.class, "class")
+
+                    for var_name in obj.instance_variables
+                        var = obj.instance_variable_get(var_name)
+                        test_and_add_reference(obj_ref, var, var_name.to_s)
+                    end
+
+                    case obj
+                    when Array, ValueSet
+                        for var in obj
+                            test_and_add_reference(obj_ref, var, "ValueSet[]")
+                        end
+                    when BGL::Graph
+                        obj.each_vertex do
+                            test_and_add_reference(obj_ref, var, "Vertex[]")
+                        end
+                        obj.each_edge do |_, _, info|
+                            test_and_add_reference(obj_ref, info, "Edge[]")
+                        end
+                    when Hash
+                        for var in obj
+                            2.times do |i|
+                                test_and_add_reference(obj_ref, var[i], "Hash[]")
+                            end
+                        end
+                    when Proc
+                        if obj.respond_to?(:references)
+                            for var in obj.references
+                                begin
+                                    test_and_add_reference(obj_ref, ObjectSpace._id2ref(var), "Proc")
+                                rescue RangeError
+                                end
+                            end
+                        end
+                    else
+                        if obj.respond_to?(:each)
+                            if obj.kind_of?(Module) || obj.kind_of?(Class)
+                                if !ignored_enumeration[obj]
+                                    ignored_enumeration[obj] = true
+                                    puts "ignoring enumerator class/module #{obj}"
+                                end
+                            else
+                                if !ignored_enumeration[obj.class]
+                                    ignored_enumeration[obj.class] = true
+                                    puts "ignoring enumerator object #{obj.class}"
+                                end
+                            end
+                        end
+                    end
+                end
+                if old_graph_size == graph.size
+                    break
+                end
+            end
+            return graph
+        end
+
+        def collapse(*klasses)
+            vertices = graph.vertices.dup
+            vertices.each do |v|
+                case v.obj
+                when *klasses
+                    next if v.root?(graph) || v.leaf?(graph)
+
+                    v.each_parent_vertex(graph) do |parent|
+                        all_parent_info = parent[v, graph]
+                        v.each_child_vertex(graph) do |child|
+                            all_child_info = v[child, graph]
+                            all_parent_info.each do |parent_info|
+                                all_child_info.each do |child_info|
+                                    add_reference(parent, child, parent_info + "." + child_info)
+                                end
+                            end
+                        end
+                    end
+                    graph.remove(v)
+                end
+            end
+        end
+
+        def to_dot
+            if !roots
+                roots = graph.vertices.find_all do |v|
+                    v.root?(graph)
+                end.to_value_set
+            else
+                roots = roots.to_value_set
+            end
+
+            io = StringIO.new("")
+
+            all_seen = ValueSet.new
+            io.puts "digraph {"
+            roots.each do |obj_ref|
+                seen = ValueSet.new
+                graph.each_dfs(obj_ref, BGL::Graph::ALL) do |from_ref, to_ref, all_info, kind|
+                    info = all_info.to_a.join(",")
+
+                    if all_seen.include?(from_ref)
+                        graph.prune
+                    else
+                        from_id = from_ref.obj.object_id
+                        to_id   = to_ref.obj.object_id
+                        io.puts "obj#{from_id} -> obj#{to_id} [label=\"#{info}\"]"
+                    end
+                    seen << from_ref << to_ref
+                end
+
+                seen.each do |obj_ref|
+                    if !all_seen.include?(obj_ref)
+                        obj = obj_ref.obj
+                        obj_id = obj_ref.obj.object_id
+                        str =
+                            if obj.respond_to?(:each)
+                                "#{obj.class}"
+                            else
+                                obj.to_s
+                            end
+
+                        color =
+                            if obj.kind_of?(Roby::EventGenerator)
+                                "cyan"
+                            elsif obj.kind_of?(Roby::Task)
+                                "blue"
+                            elsif obj.kind_of?(BGL::Graph)
+                                "magenta"
+                            elsif obj.kind_of?(Hash) || obj.kind_of?(Array) || obj.kind_of?(ValueSet)
+                                "green"
+                            else
+                                "black"
+                            end
+
+                        io.puts "obj#{obj_id} [label=\"#{str}\",color=#{color}];"
+                    end
+                end
+                all_seen.merge(seen)
+            end
+            io.puts "}"
+            io.string
+        end
+    end
+    end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: utilrb
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 6
-  - 5
-  version: 1.6.5
+  - 6
+  version: 1.6.6
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-07 00:00:00 Z
+date: 2012-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: facets
@@ -121,6 +121,7 @@ files:
 - bm/allocation.rb
 - bm/speed.rb
 - ext/extconf.rb
+- ext/proc.cc
 - ext/ruby_internals-1.8.h
 - ext/ruby_internals-1.9.h
 - ext/swap.cc
@@ -189,6 +190,7 @@ files:
 - lib/utilrb/objectstats.rb
 - lib/utilrb/pkgconfig.rb
 - lib/utilrb/rake_common.rb
+- lib/utilrb/ruby_object_graph.rb
 - lib/utilrb/set.rb
 - lib/utilrb/set/to_s.rb
 - lib/utilrb/socket/tcp_server.rb
@@ -260,22 +262,22 @@ signing_key:
 specification_version: 3
 summary: Yet another Ruby toolkit
 test_files: 
-- test/test_kernel.rb
+- test/test_weakref.rb
 - test/test_unbound_method.rb
-- test/test_hash.rb
+- test/test_enumerable.rb
 - test/test_exception.rb
-- test/test_config.rb
-- test/test_time.rb
-- test/test_logger.rb
-- test/test_module.rb
 - test/test_objectstats.rb
-- test/test_enumerable.rb
-- test/test_gc.rb
-- test/test_misc.rb
-- test/test_object.rb
-- test/test_array.rb
 - test/test_dir.rb
-- test/test_weakref.rb
-- test/test_proc.rb
+- test/test_time.rb
+- test/test_misc.rb
 - test/test_set.rb
+- test/test_config.rb
+- test/test_logger.rb
+- test/test_proc.rb
+- test/test_hash.rb
+- test/test_array.rb
+- test/test_object.rb
+- test/test_module.rb
+- test/test_kernel.rb
 - test/test_pkgconfig.rb
+- test/test_gc.rb