rbbcc 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b46fa6dd0b99e4a178bc00bad497beab5d72426517f3d7b328c29d492e9e8a1
-  data.tar.gz: a5f84fdc89d50621b3dd06eca22aea243efc1991ec053acece136016ccbdfb64
+  metadata.gz: 21812e821d8cced71e6942b17c96800e6ac9c8fcbb3f09abffea3dd755b41365
+  data.tar.gz: 1c9d332fd7394ba8e0b4ca027335e4a02cc39ae5d3445e2103cf23b29cca6ccf
 SHA512:
-  metadata.gz: 532f1d544b56d82e68d5931aac278bf36a850943c3e78e8851c59e56852ebe4f6a3d974fa6c129544f0c7f895696bd9b894f3d033490faff8c408bbd7deed424
-  data.tar.gz: 03de507c9094d850d77253610d2ffe08e2ee4ad97048e742f4c283ce6d8748de68f019a0e247ac826b5cbcbd48664a359ec57c92113f5f4015bc0c0f1984b482
+  metadata.gz: 19b29f9942f91dc22bedd627879f967dde601a864678958f4d047b79302714ba68ab9eda5b4e260f987be7dcc5792b480bc14f92ac117af7da7a79e0092cfa44
+  data.tar.gz: 3dd4df07f67f833b3e2157053ff0aa5a138dd65c907f40486845fe619553030711b5622f494142d7ca1fe66b0bebf31fa563e71e36ff9184bef71fc32bfb0116

data/.github/workflows/ci.yml

@@ -1,18 +1,18 @@
 name: Tests
 on:
   push:
-    branches: [ default ]
+    branches: [ master ]
   pull_request:
-    branches: [ default ]
+    branches: [ master ]
 
 jobs:
   test:
     strategy:
       matrix:
-        libbcc_version: [0.17.0, 0.16.0, 0.12.0]
-        ruby_version: [2.7.2, 3.0.0]
+        libbcc_version: [0.17.0]
+        ruby_version: [3.0.0]
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Login to ghcr.io
@@ -35,4 +35,4 @@ jobs:
                    rbbcc-ci-${{ matrix.libbcc_version }}-${{ matrix.ruby_version }} \
                    /bin/bash -c \
                    'cd /rbbcc && bundle install && bundle exec rake test'"
-    
+    

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    rbbcc (0.8.0)
+    rbbcc (0.9.1)
 
 GEM
   remote: https://rubygems.org/
@@ -16,24 +16,33 @@ GEM
     appbundler (0.13.4)
       mixlib-cli (>= 1.4, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-    chef-utils (17.10.0)
+    chef-utils (19.2.12)
       concurrent-ruby
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    method_source (1.0.0)
-    minitest (5.16.1)
+    concurrent-ruby (1.3.6)
+    drb (2.2.3)
+    io-console (0.8.2)
+    method_source (1.1.0)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
     mixlib-cli (2.1.8)
-    mixlib-shellout (3.2.7)
+    mixlib-shellout (3.4.10)
       chef-utils
-    pry (0.14.1)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rake (13.0.6)
-    specific_install (0.3.7)
+      reline (>= 0.6.0)
+    rake (13.3.1)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    specific_install (0.3.8)
 
 PLATFORMS
   aarch64-linux
   arm64-darwin-21
+  arm64-darwin-25
 
 DEPENDENCIES
   appbundler

data/lib/rbbcc/bcc.rb

@@ -231,34 +231,31 @@ module RbBCC
         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, dev_name)
-      else
-        if src_file
-          text = File.read(src_file)
-        end
+      if src_file
+        text = File.read(src_file)
+      end
 
-        @usdt_contexts = usdt_contexts
-        if code = gen_args_from_usdt
-          text = code + text
-        end
+      @usdt_contexts = usdt_contexts
+      if code = gen_args_from_usdt
+        text = code + text
+      end
 
 
-        cflags_safe = if cflags.empty? or !cflags[-1].nil?
-                        cflags + [nil]
-                      else
-                        cflags
-                      end
+      cflags_safe = if cflags.empty? or !cflags[-1].nil?
+                      cflags + [nil]
+                    else
+                      cflags
+                    end
+
+      @module = Clib.do_bpf_module_create_c_from_string(
+        text,
+        debug,
+        cflags_safe.pack("p*"),
+        cflags_safe.size,
+        allow_rlimit,
+        dev_name
+      )
 
-        @module = Clib.do_bpf_module_create_c_from_string(
-          text,
-          debug,
-          cflags_safe.pack("p*"),
-          cflags_safe.size,
-          allow_rlimit,
-          dev_name
-        )
-      end
       @funcs = {}
       @tables = {}
       @perf_buffers = {}

data/lib/rbbcc/clib.rb

@@ -24,13 +24,27 @@ module RbBCC
       @@libbcc_version >= Gem::Version.new(ver)
     end
 
-    extend Fiddle::Importer
-    targets = %w(0.18.0 0.17.0 0.16.0 0.15.0 0.14.0 0.13.0 0.12.0 0.11.0 0.10.0)
-    if default_load = ENV['LIBBCC_VERSION']
-      targets.unshift(default_load)
-      targets.uniq!
+    def self.system_libbcc_versions
+      paths = ['/usr/lib', '/usr/lib64', '/usr/local/lib', '/usr/lib/x86_64-linux-gnu'].freeze
+      candidates = paths.flat_map do |path|
+        Dir.glob("#{path}/libbcc.so.[0-9]*")
+      end
+
+      candidates.map do |path|
+        path.match(/libbcc\.so\.([\d.]+)/)&.captures&.first
+      end.compact.uniq.sort_by { |v| Gem::Version.new(v) }.reverse
+    rescue
+      []
     end
 
+    extend Fiddle::Importer
+
+    targets = if (env_ver = ENV['LIBBCC_VERSION'])
+                [env_ver]
+              else
+                self.system_libbcc_versions
+              end
+    raise LoadError, "no target libbcc to load" if targets.empty?
     targets.each do |to_load|
       begin
         dlload "libbcc.so.#{to_load}"
@@ -44,7 +58,6 @@ module RbBCC
     end
     typealias "size_t", "int"
 
-    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/version.rb

@@ -1,3 +1,3 @@
 module RbBCC
-  VERSION = "0.8.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rbbcc
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Uchio Kondo
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: BCC port for MRI. See https://github.com/iovisor/bcc
 email:
@@ -112,7 +111,6 @@ homepage: https://github.com/udzura/rbbcc
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: BCC port for MRI
 test_files: []