rbbcc 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca8253cb2fb2d8bd3824d294d54f13d5e34a9326d25244ce7ea4d4fddc202978
-  data.tar.gz: 71796d5a508760ed617347d2275f30e90fb9a8b9d68354aba884b33d4625cd3e
+  metadata.gz: 92b4487b6e8f5b72aad25113da967b51b2feb064361676b093441b6fd0bab672
+  data.tar.gz: 03d71e58ddebacdbf41f0c1ad4422bcfa1b9acdda3ac568068a2a8751b594a97
 SHA512:
-  metadata.gz: b36369cea2736423e7722b8cf087460b3966d0f73b6b9579b98aba643e0c4f6eef3bcd0f0089d0f25da61df3b2b612165ad8d1d25911511138b4b228eb94a6e5
-  data.tar.gz: 6e8047c3928dd676218a88c618c8546ae20de8a499acd6d700df0d0a1f4363fbee26cb168fd1190de879f939a57fc4a43cfaa453cecf50c52c0ab105f080b04f
+  metadata.gz: bb9234154fe245bf001676f1a6e7b1e5bcce31e4962bd0d646746d1f3c286722def93899877c9a200a516fd33366ef7c73fcf2a7a22731fb76225edb5477f449
+  data.tar.gz: 89415cbd8cadade4b49b53b5fd1c024198bfbd3424e0d95ecaf8e00381495570e171bcf54f4c395ddf40d762821da1425945761d80166aef724e038f43ae0f3c

data/Gemfile

@@ -10,6 +10,7 @@ gem "minitest", ">= 5"
 
 group :omnibus_package do
   gem "appbundler"
+  gem "specific_install"
 end
 
 group :plugin_dev do

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    rbbcc (0.6.3)
+    rbbcc (0.6.4)
 
 GEM
   remote: https://rubygems.org/
@@ -27,6 +27,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     rake (13.0.1)
+    specific_install (0.3.5)
 
 PLATFORMS
   ruby
@@ -39,6 +40,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rbbcc!
   rbbcc-hello!
+  specific_install
 
 BUNDLED WITH
    2.1.4

data/lib/rbbcc/bcc.rb

@@ -220,7 +220,7 @@ module RbBCC
       end
     end
 
-    def initialize(text: "", src_file: nil, hdr_file: nil, 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, dev_name: nil)
       @kprobe_fds = {}
       @uprobe_fds = {}
       @tracepoint_fds = {}
@@ -232,7 +232,7 @@ module RbBCC
       end
 
       if src_file && src_file.end_with?(".b")
-        @module = Clib.bpf_module_create_b(src_file, hdr_file, debug, device)
+        @module = Clib.bpf_module_create_b(src_file, hdr_file, debug, dev_name)
       else
         if src_file
           text = File.read(src_file)
@@ -250,12 +250,13 @@ module RbBCC
                         cflags
                       end
 
-        @module = Clib.bpf_module_create_c_from_string(
+        @module = Clib.do_bpf_module_create_c_from_string(
           text,
           debug,
           cflags_safe.pack("p*"),
           cflags_safe.size,
-          allow_rlimit
+          allow_rlimit,
+          dev_name
         )
       end
       @funcs = {}

data/lib/rbbcc/clib.rb

@@ -44,24 +44,38 @@ module RbBCC
     end
     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 *)'
 
     if libbcc_version_gteq?("0.11.0")
+      extern 'void * bpf_module_create_c_from_string(
+                  const char *text, unsigned int flags, const char *cflags[],
+                  int ncflags, int allow_rlimit,
+                  const char *dev_name)'
       extern 'int bcc_func_load(
                   void *program, int prog_type, const char *name,
                   const struct bpf_insn *insns, int prog_len,
                   const char *license, unsigned int kern_version,
                   int log_level, char *log_buf, unsigned int log_buf_size,
                   const char *dev_name)'
+      def self.do_bpf_module_create_c_from_string(text, flags, cflags, ncflags, allow_limit, dev_name)
+        bpf_module_create_c_from_string(text, flags, cflags, ncflags, allow_limit, dev_name)
+      end
+
       def self.do_bcc_func_load(mod, prog_type, name, insns, len, license, kver, loglv, buf, buf_size, device)
         bcc_func_load(mod, prog_type, name, insns, len, license, kver, loglv, buf, buf_size, device)
       end
     else
+      extern 'void * bpf_module_create_c_from_string(
+                  const char *text, unsigned int flags, const char *cflags[],
+                  int ncflags, int allow_rlimit)'
       extern 'int bcc_func_load(void *, int, char *, void *, int, char *, unsigned int, int, char *, unsigned int)'
+      def self.do_bpf_module_create_c_from_string(text, flags, cflags, ncflags, allow_limit, dev_name=nil)
+        bpf_module_create_c_from_string(text, flags, cflags, ncflags, allow_limit)
+      end
+
       def self.do_bcc_func_load(mod, prog_type, name, insns, len, license, kver, loglv, buf, buf_size, device)
         bcc_func_load(mod, prog_type, name, insns, len, license, kver, loglv, buf, buf_size)
       end

data/lib/rbbcc/version.rb

@@ -1,3 +1,3 @@
 module RbBCC
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbcc
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies: []
 description: BCC port for MRI. See https://github.com/iovisor/bcc
 email: