rbbcc 0.3.1 → 0.4.0

data/lib/rbbcc/bcc.rb

@@ -14,6 +14,20 @@ module RbBCC
 
   class BCC
     class << self
+      def _find_file(filename)
+        if filename
+          unless File.exist?(filename)
+            t = File.expand_path "../#{filename}", $0
+            if File.exist?(t)
+              filename = t
+            else
+              raise "Could not find file #{filename}"
+            end
+          end
+        end
+        return filename
+      end
+
       def ksym(addr, show_module: false, show_offset: false)
         self.sym(addr, -1, show_module: show_module, show_offset: show_offset, demangle: false)
       end
@@ -163,23 +177,37 @@ module RbBCC
       end
     end
 
-    def initialize(text:, debug: 0, cflags: [], usdt_contexts: [], allow_rlimit: 0)
+    def initialize(text: "", src_file: nil, hdr_file: nil, debug: 0, cflags: [], usdt_contexts: [], allow_rlimit: 0)
       @kprobe_fds = {}
       @uprobe_fds = {}
       @tracepoint_fds = {}
       @raw_tracepoint_fds = {}
-      @usdt_contexts = usdt_contexts
-      if code = gen_args_from_usdt
-        text = code + text
-      end
-
-      @module = Clib.bpf_module_create_c_from_string(
-        text,
-        debug,
-        cflags.pack('p*'),
-        cflags.size,
-        allow_rlimit
-      )
+
+      if src_file
+        src_file = BCC._find_file(src_file)
+        hdr_file = BCC._find_file(hdr_file)
+      end
+
+      if src_file && src_file.end_with?(".b")
+        @module = Clib.bpf_module_create_b(src_file, hdr_file, debug, device)
+      else
+        if src_file
+          text = File.read(src_file)
+        end
+
+        @usdt_contexts = usdt_contexts
+        if code = gen_args_from_usdt
+          text = code + text
+        end
+
+        @module = Clib.bpf_module_create_c_from_string(
+          text,
+          debug,
+          cflags.pack('p*'),
+          cflags.size,
+          allow_rlimit
+        )
+      end
       @funcs = {}
       @tables = {}
       @perf_buffers = {}

data/lib/rbbcc/clib.rb

@@ -45,6 +45,7 @@ module RbBCC
     typealias "size_t", "int"
 
     extern 'void * bpf_module_create_c_from_string(char *, unsigned int, char **, int, long)'
+    extern 'void * bpf_module_create_b(char *filename, char *proto_filename, unsigned int flags, char *dev_name)'
     extern 'int bpf_num_functions(void *)'
     extern 'char * bpf_function_name(void *, int)'
     extern 'void bpf_module_destroy(void *)'

data/lib/rbbcc/table.rb

@@ -78,7 +78,9 @@ module RbBCC
       return next_key
     end
 
-    def [](key)
+    def [](_key)
+      key = normalize_key(_key)
+
       leaf = Fiddle::Pointer.malloc(self.leafsize)
       res = Clib.bpf_lookup_elem(self.map_fd, key, leaf)
       if res < 0
@@ -91,7 +93,8 @@ module RbBCC
       self[key] || raise(KeyError, "key not found")
     end
 
-    def []=(key, leaf)
+    def []=(_key, leaf)
+      key = normalize_key(_key)
       res = Clib.bpf_update_elem(self.map_fd, key, leaf, 0)
       if res < 0
         raise SystemCallError.new("Could not update table", Fiddle.last_error)
@@ -180,6 +183,17 @@ module RbBCC
     end
 
     private
+    def normalize_key(key)
+      case key
+      when Fiddle::Pointer
+        key
+      when Integer
+        byref(key, keysize)
+      else
+        raise KeyError, "#{key.inspect} must be integer or pointor"
+      end
+    end
+
     def byref(value, size=sizeof("int"))
       pack_fmt = case size
                  when sizeof("int") ; "i!"
@@ -207,14 +221,6 @@ module RbBCC
     end
     alias length size
 
-    def [](key)
-      super(normalize_key(key))
-    end
-
-    def []=(key, value)
-      super(normalize_key(key), value)
-    end
-
     def clearitem(key)
       self[key] = byref(0, @leafsize)
     end
@@ -229,18 +235,6 @@ module RbBCC
         b.call(v.to_bcc_value)
       end
     end
-
-    private
-    def normalize_key(key)
-      case key
-      when Fiddle::Pointer
-        key
-      when Integer
-        byref(key, keysize)
-      else
-        raise KeyError, "#{key.inspect} must be integer or pointor"
-      end
-    end
   end
 
   class PerfEventArray < TableBase

data/lib/rbbcc/version.rb

@@ -1,3 +1,3 @@
 module RbBCC
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/rbbcc.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "minitest"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbcc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,28 @@ files:
 - bin/console
 - bin/setup
 - docs/README.md
+- docs/answers/01-hello-world.rb
+- docs/answers/02-sys_sync.rb
+- docs/answers/03-hello_fields.rb
+- docs/answers/04-sync_timing.rb
+- docs/answers/05-sync_count.rb
+- docs/answers/06-disksnoop.rb
+- docs/answers/07-hello_perf_output.rb
+- docs/answers/08-sync_perf_output.rb
+- docs/answers/09-bitehist.rb
+- docs/answers/10-disklatency.rb
+- docs/answers/11-vfsreadlat.c
+- docs/answers/11-vfsreadlat.rb
+- docs/answers/12-urandomread.rb
+- docs/answers/13-disksnoop_fixed.rb
+- docs/answers/14-strlen_count.rb
+- docs/answers/15-nodejs_http_server.rb
+- docs/answers/16-task_switch.c
+- docs/answers/16-task_switch.rb
+- docs/answers/node-server.js
 - docs/getting_started.md
+- docs/projects_using_rbbcc.md
+- docs/tutorial_bcc_ruby_developer.md
 - examples/bitehist.rb
 - examples/charty/Gemfile
 - examples/charty/Gemfile.lock