codegraph 0.7.2 → 0.7.3

data/gemspec

@@ -2,8 +2,8 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "codegraph"
-  s.version           = "0.7.2"
-  s.date              = "2010-11-01"
+  s.version           = "0.7.3"
+  s.date              = "2010-11-05"
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'
   s.files             = ["lib/codegraph.rb","bin/codegraph"] + ["gemspec","LICENSE"]

data/lib/codegraph.rb

@@ -1,8 +1,10 @@
 require 'rubygems'
+require 'pp'
 require 'rgl/adjacency'
 require 'rgl/dot'
 require 'rgl/rdot'
 require 'rgl/traversal'
+require 'thread'
 
 class FunctionGraph < RGL::DirectedAdjacencyGraph
    attr_accessor :funx, :internal
@@ -46,7 +48,7 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
       super
       # the following attribute will hold the functionnames and their bodies
       @funx = Hash.new
-
+      @lock = Mutex.new
       # Should the internal functions be displayed?
       @internal = false
 
@@ -57,86 +59,77 @@ class FunctionGraph < RGL::DirectedAdjacencyGraph
    # 2. One for functions inside the file 1
    #  and fill the @funx hash
    def genFiles(graph, filelist, exclude=[])
-      names, kinds, lines, files = [],[],[],[]
+      threads = []
 
-      funxFile   = "funxnames"
-      ctagsKinds='--c-kinds=f --fortran-kinds=fs --php-kinds=f --perl-kinds=f'
       filelist.each {|file|
-        puts "Processing #{file} ..."
-        basefile   = File.basename(file)
-        temfile    = "_" + basefile
-        case File.extname(file)
-        when '.c','.h' 
-          cppCommand = "cpp -w -fpreprocessed -E  -fdirectives-only #{file}  -o #{@@codehomedir}/#{temfile} 2>/dev/null"
-          cppCommand = "cpp -fpreprocessed #{file}  -o #{@@codehomedir}/#{temfile} 2>/dev/null"
-          grep       = "grep -v -e '^$' #{temfile} | grep -v -e '^#' > #{basefile}"
-        when '.f','.f77','.f90','.f95'
-          cppCommand = "cp #{file} #{@@codehomedir}/#{temfile}"
-          grep       = "grep -v -e '^$' #{temfile} | grep -v -e '^ *!' > #{basefile}"
-        else
-          cppCommand = "cp #{file} #{@@codehomedir}/#{temfile}"
-          grep       = "grep -v -e '^$' #{temfile} | grep -v -e '^#' > #{basefile}"
-        end
-        cd         = "cd #{@@codehomedir}"
-        gen4ctags  = "ctags -x #{ctagsKinds} #{basefile} | sort -n -k 3 > " + funxFile
-        command    = [cppCommand,cd,grep,gen4ctags].join(";")
-
-        puts command if false
-        system(command)
-
-        open(@@codehomedir+'/'+funxFile).readlines.each {|line|
-          name, kind, lineno, file = line.split[0,4]
-          names << name
-          kinds << kind
-          lines << lineno.to_i
-          files << file
+        threads << Thread.new(file, @@codehomedir) {|file,codehomedir|
+          funxFile   = "funxnames"
+          ctagsKinds = '--c-kinds=f --fortran-kinds=fs --php-kinds=f --perl-kinds=f'
+
+          puts "Processing #{file} ..." if false
+          basefile   = File.basename(file)
+          temfile    = "_" + basefile
+          case File.extname(file)
+          when '.c','.h' 
+            cppCommand = "cpp -w -fpreprocessed -E  -fdirectives-only #{file}  -o #{codehomedir}/#{temfile} 2>/dev/null"
+            cppCommand = "cpp -fpreprocessed #{file}  -o #{codehomedir}/#{temfile} 2>/dev/null"
+            grep       = "grep -v -e '^$' #{codehomedir}/#{temfile} | grep -v -e '^#' > #{codehomedir}/#{basefile}"
+          when '.f','.f77','.f90','.f95'
+            cppCommand = "cp #{file} #{codehomedir}/#{temfile}"
+            grep       = "grep -v -e '^$' #{codehomedir}/#{temfile} | grep -v -e '^ *!' > #{codehomedir}/#{basefile}"
+          else
+            cppCommand = "cp #{file} #{codehomedir}/#{temfile}"
+            grep       = "grep -v -e '^$' #{codehomedir}/#{temfile} | grep -v -e '^#' > #{codehomedir}/#{basefile}"
+          end
+          gen4ctags  = "ctags -x #{ctagsKinds}  #{codehomedir}/#{basefile} | sort -n -k 3"
+          command    = [cppCommand,grep].join(";")
+
+          puts command if false
+          system(command)
+
+          code = open(codehomedir+'/'+ File.basename(file)).readlines
+          funxLocations = IO.popen(gen4ctags).readlines.map {|l| l.split[0,4]}
+          funxLocations.each_with_index {|ary,i|
+            name, kind, line, file = ary
+            puts name if false
+            line           = line.to_i
+            startLineIndex = line - 1
+            endLineIndex   = (i+1 < funxLocations.size) ? funxLocations[i+1][2].to_i - 2 : -1
+            body = code[startLineIndex..endLineIndex].join
+            @lock.synchronize {
+              @funx.store(name,body)
+            }
+          }
         }
       }
+      threads.each {|t| t.join}
 
-      unless File.size?(@@codehomedir+'/'+funxFile)
+      if @funx.empty?
          puts "no functions found"
          exit
       end
-
-      meta = [names, kinds, lines, files]
-
-      # read the source once and save the function bodies as values 
-      # of the function names
-
-      metasize = meta[2].size
-      lastfile,code = nil,nil
-      meta.transpose.each_with_index {|ary,i|
-        name, kind, line, file = ary
-        
-        if file != lastfile
-          code = open(@@codehomedir+'/'+ File.basename(file)).readlines
-          codeLength = code.length
-        end
-        startLineIndex = meta[2][i]-1
-        endLineIndex   = (i+1 < metasize) ? meta[2][i+1] - 2 : -1
-        # code-Index starts with 0 vs. line numbbers in (meta|m).lines start with 1
-        body = code[startLineIndex..endLineIndex].join
-
-        @funx.store(name,body)
-        lastfile = file
-      }
    end
    
    # fill the graph with all functions found in <filelist> 
    # while all functions from <exclude> aren't recognized
    def fill(filelist,exclude=[])
+     threads = []
       # generate the necessary files and fill @funx
       genFiles(self,filelist,exclude)
 
       # scan functions for the function names
       names = @funx.keys
       @funx.each_pair {|name,body|
-        puts "Add func: #{name}" if true
-            add_vertex(name)
-            (names - [name] + @@internal_funx).each { |func|
-              add_edge("#{name}","#{func}") if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(gbody)
-            }
-      }
+#        threads << Threads.new(name,body,names) {|name,body|
+          puts "Add func: #{name}" if false
+          add_vertex(name)
+          (names - [name] + @@internal_funx).each { |func|
+            puts body if false
+            add_edge("#{name}","#{func}") if/#@@matchBeforFuncName#{func}#@@matchAfterFuncName/.match(body)
+          }
+        }
+#      }
+#      threads.each {|t| t.join}
    end
 
    def limit(depth)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Ralf Mueller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 +01:00
+date: 2010-11-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency