rbbcc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 181f92fbe4475f87b329107f70fc1e15ac0cbfa044560e6c030dab5cd2456dab
-  data.tar.gz: 8699282acb475db5d641d2aa46234fb341461db78b105bc4520c5dba92226f13
+  metadata.gz: 83335da3fa30d52d38210f68efa6cf19cb5d44143ecc58ecdc6d4df30560303e
+  data.tar.gz: 75d0c97a8624a72928b4195bd830257c79e6a5e883058d9ae5c6c53512fccb1b
 SHA512:
-  metadata.gz: 93c042656a0023f11759e27fa04bd6d7a8533c0edcf0b2cbf33b99e669792dbec304c6af13f257cee35a35ae80d190d7c42f11e3e99993ec42708747a886f556
-  data.tar.gz: 39127d19ed85575e4bc0563802e7523d3bbad4f15541ed6f372d5e29d4036be784c1b881c4a9604b65a631230a5868786116cb7da63ceef73bded49a81703f72
+  metadata.gz: a634d67b7b8a322ac433825bdbf376e7ef3ebe30f2e43dc477eb6f52c14fbc812bf04a286a6e9af30ad3ffc999fe370c2bdfe0fee56608e501618973873f74a7
+  data.tar.gz: 9b9cc3a877ab56ec8ceb516b0fc576fe981784e8689ec026974e429cecbe6e82d6da06e74d7473d9e38819b50e2d430c01801d1deecaee3bc197900a91d93684

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbbcc (0.0.1.pre)
+    rbbcc (0.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/rbbcc.rb

@@ -1,6 +1,7 @@
 require "rbbcc/bcc"
 require "rbbcc/clib"
 require "rbbcc/usdt"
+require "rbbcc/symbol_cache"
 require "rbbcc/version"
 
 module RbBCC

data/lib/rbbcc/bcc.rb

@@ -1,4 +1,5 @@
 require 'rbbcc/consts'
+require 'rbbcc/symbol_cache'
 
 module RbBCC
   SYSCALL_PREFIXES = [
@@ -42,6 +43,7 @@ module RbBCC
 
       at_exit { self.cleanup }
     end
+    attr_reader :module
 
     def gen_args_from_usdt
       ptr = Clib.bcc_usdt_genargs(@usdt_contexts.map(&:context).pack('J*'), @usdt_contexts.size)
@@ -204,8 +206,14 @@ module RbBCC
     def fix_syscall_fnname(name)
       SYSCALL_PREFIXES.each do |prefix|
         if name.start_with?(prefix)
-          # TODO resolution from sym cache
-          return SYSCALL_PREFIXES[0] + name.sub(prefix, "")
+          real = SYSCALL_PREFIXES.find { |candidate|
+            SymbolCache.resolve_global(name.sub(prefix, candidate))
+          }
+          unless real
+            real = prefix
+          end
+
+          return name.sub(prefix, real)
         end
       end
       return name

data/lib/rbbcc/clib.rb

@@ -37,5 +37,18 @@ module RbBCC
     extern 'int bcc_usdt_enable_probe(void *, char *, char *)'
     extern 'char * bcc_usdt_genargs(void **, int)'
     extern 'void bcc_usdt_foreach_uprobe(void *, void *)'
+
+    BCCSymbol = struct([
+                         "const char *name",
+                         "const char *demangle_name",
+                         "const char *module",
+                         "unsigned long offset"
+                 ])
+
+    extern 'void * bcc_symcache_new(int, void *)'
+    extern 'void bcc_free_symcache(void *, int)'
+    extern 'int bcc_symcache_resolve(void *, unsigned long, void *)'
+    extern 'int bcc_symcache_resolve_no_demangle(void *, unsigned long, void *)'
+    extern 'int bcc_symcache_resolve_name(void *, char *, char *, unsigned long long *)'
   end
 end

data/lib/rbbcc/symbol_cache.rb

@@ -0,0 +1,55 @@
+require 'rbbcc/clib'
+
+module RbBCC
+  class SymbolCache
+    class << self
+      def caches
+        @caches ||= {}
+      end
+
+      def cache(pid)
+        pid = -1 if pid < 0 && pid != -1
+        caches[pid] ||= SymbolCache.new(pid)
+        caches[pid]
+      end
+      alias [] cache
+
+      def resolve_global(name)
+        self[-1].resolve_name(nil, name)
+      end
+    end
+
+    def initialize(pid)
+      @cache = Clib.bcc_symcache_new(pid, nil)
+    end
+
+    def resolve(addr, demangle)
+      sym = Clib::BCCSymcache.malloc
+      ret = if demangle
+              Clib.bcc_symcache_resolve(@cache, addr, sym)
+            else
+              Clib.bcc_symcache_resolve_no_demangle(@cache, addr, sym)
+            end
+      if res < 0
+        return [nil, addr, nil]
+      end
+
+      if demangle
+        name_res = sym.demangle_name
+        # Clib.bcc_symbol_free_demangle_name(sym)
+      else
+        name_res = sym.name
+      end
+
+      return [name_res, sym.offset, Clib.__extract_char(sym.module)]
+    end
+
+    def resolve_name(_module, name)
+      addr_p = Fiddle::Pointer.malloc(Fiddle::SIZEOF_UINTPTR_T)
+      if Clib.bcc_symcache_resolve_name(@cache, _module, name, addr_p) < 0
+        return false
+      end
+      return addr_p
+    end
+  end
+end

data/lib/rbbcc/version.rb

@@ -1,3 +1,3 @@
 module RbBCC
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbcc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - lib/rbbcc/bcc.rb
 - lib/rbbcc/clib.rb
 - lib/rbbcc/consts.rb
+- lib/rbbcc/symbol_cache.rb
 - lib/rbbcc/usdt.rb
 - lib/rbbcc/version.rb
 - rbbcc.gemspec