rbbcc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1911b0a6e9450e76b3fda2c56c45bfc17846638e1ca99e64e983d99f99dff64
-  data.tar.gz: e4841d103a87ee45ced700ea7dff562a305e1cbf1172ef35da40be063d4ee698
+  metadata.gz: 162758633aea60cbe4979dd77f61603a7f2032d624594b523f990d703d9fc0e6
+  data.tar.gz: 39b9b0b9fd390f45a5a242d6182197d9e39de0fb0444f06c94872a42b5dd4d5a
 SHA512:
-  metadata.gz: fd3aba48720c19d46efa02eac50fd758e883306616bb14068e13c4062f8d8efd4f9852b2b5d7f8eded678a9954e36070cb13f2be99c271b6983ab8ec75e53807
-  data.tar.gz: 63170a77e06d0c15d5dac6eed68112232b475259fcce7a07f4c99ba21baf9df0e85faa307fa2c868afc4aea9888ac7b4779188f03e0cd40d0cbedfab28c41873
+  metadata.gz: e807d4903cbd8683eb58b073700a24993824e23027de3445d2729728e9cbe7d556a7948a15efaf5c5e7462521675854ec40e32e9776d64c637778fcbad4ad79c
+  data.tar.gz: fcecb00f5eb34f247987b445c59daa221b99ed477ffcd5355e965ac20c97cbe748b3650f2066de1b6575e4ffaf97c7cf21bf9751a7e55ec02cfb0a1837f3e7be

data/.gitignore

@@ -10,4 +10,8 @@
 
 .ruby-version
 
-/examples/work/*
+/examples/work/*
+
+/bin
+!/bin/setup
+!/bin/console

data/.semaphore/semaphore.yml

@@ -0,0 +1,19 @@
+version: v1.0
+name: Ruby Test
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+blocks:
+  - name: Basic Test
+    task:
+      jobs:
+        - name: ruby test
+          matrix:
+            - env_var: LIBBCC_VERSION
+              values: [ "0.12.0", "0.11.0", "0.10.0" ]
+          commands:
+            - sem-version c 7
+            - sem-version ruby 2.6.5
+            - checkout
+            - ./semaphore.sh

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    rbbcc (0.2.0)
+    rbbcc (0.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
     method_source (0.9.2)
+    minitest (5.14.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -18,6 +19,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
+  minitest
   pry
   rake (~> 10.0)
   rbbcc!

data/README.md

@@ -1,6 +1,6 @@
 # RbBCC
 
-[![Gem Version](https://badge.fury.io/rb/rbbcc.svg)](https://badge.fury.io/rb/rbbcc)
+[![Gem Version](https://badge.fury.io/rb/rbbcc.svg)](https://badge.fury.io/rb/rbbcc) [![CI status](https://udzura.semaphoreci.com/badges/rbbcc.svg)](https://udzura.semaphoreci.com/projects/rbbcc)
 
 RbBCC is a port of [BCC](https://github.com/iovisor/bcc) in MRI. See iovisor project page.
 

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
-task :default => :spec
+
+require "rake/testtask"
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/**/*_test.rb']
+end
+desc "Run tests"
+
+task :default => :test

data/lib/rbbcc/clib.rb

@@ -25,15 +25,22 @@ module RbBCC
     end
 
     extend Fiddle::Importer
-    begin
-      default_load = ENV['LIBBCC_VERSION'] || "0.11.0"
-
-      dlload "libbcc.so.#{default_load}"
-      self.libbcc_version = default_load
-    rescue Fiddle::DLError => e
-      warn "Fall back to libbcc 0.10.0: #{e.inspect}"
-      dlload "libbcc.so.0.10.0"
-      self.libbcc_version = "0.10.0"
+    targets = %w(0.12.0 0.11.0 0.10.0)
+    if default_load = ENV['LIBBCC_VERSION']
+      targets.unshift(default_load)
+      targets.uniq!
+    end
+
+    targets.each do |to_load|
+      begin
+        dlload "libbcc.so.#{to_load}"
+        self.libbcc_version = to_load
+        break
+      rescue Fiddle::DLError => e
+        if targets.last == to_load
+          raise LoadError, "no target libbcc to load"
+        end
+      end
     end
     typealias "size_t", "int"
 
@@ -70,6 +77,7 @@ module RbBCC
     extern 'char * bpf_table_key_desc(void *, char *)'
     extern 'char * bpf_table_leaf_desc(void *, char *)'
     extern 'int bpf_update_elem(int fd, void *key, void *value, unsigned long long flags)'
+    extern 'int bpf_delete_elem(int fd, void *key)'
 
     extern 'int bpf_attach_kprobe(int, int, char *, char *, unsigned long, int)'
     extern 'int bpf_detach_kprobe(char *)'

data/lib/rbbcc/table.rb

@@ -96,6 +96,14 @@ module RbBCC
       if res < 0
         raise SystemCallError.new("Could not update table", Fiddle.last_error)
       end
+      leaf
+    end
+
+    def delete(key)
+      res = Clib.bpf_delete_elem(self.map_fd, key)
+      if res < 0
+        raise KeyError, "key not found"
+      end
       res
     end
 
@@ -127,6 +135,11 @@ module RbBCC
       enum_for(:each_pair).to_a
     end
 
+    def clear
+      each_key {|key| self.delete(key) }
+      return items # reload contents
+    end
+
     def print_log2_hist(val_type="value",
                         section_header: "Bucket ptr",
                         section_print_fn: nil,
@@ -198,6 +211,19 @@ module RbBCC
       super(normalize_key(key))
     end
 
+    def []=(key, value)
+      super(normalize_key(key), value)
+    end
+
+    def clearitem(key)
+      self[key] = byref(0, @leafsize)
+    end
+
+    def delete(key)
+      # Delete in Array type does not have an effect, so zero out instead
+      clearitem(key)
+    end
+
     def each(&b)
       each_value do |v|
         b.call(v.to_bcc_value)

data/lib/rbbcc/version.rb

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

data/rbbcc.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "minitest"
 end

data/semaphore.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# packages
+
+sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4052245BD4284CDD
+echo "deb https://repo.iovisor.org/apt/$(lsb_release -cs) $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/iovisor.list
+sudo apt -y update
+sudo apt -y install libbcc
+
+# build libbcc 0.11/0.12
+ORIG_DIR=$(pwd)
+sudo mkdir -p /opt/bcc
+
+cd /
+sudo chown $(whoami) /opt/bcc
+cache has_key libbcc-so && cache restore libbcc-so
+sudo chown -R root /opt/bcc
+cd -
+
+if test "$(ls /opt/bcc | wc -l)" -le "0"; then
+  sudo apt -y install bison build-essential cmake flex git libedit-dev \
+    libllvm6.0 llvm-6.0-dev libclang-6.0-dev python zlib1g-dev libelf-dev
+
+  sudo mkdir -p /opt/bcc-work
+  sudo chown $(whoami) /opt/bcc-work
+  cd /opt/bcc-work
+  git clone https://github.com/iovisor/bcc.git
+  mkdir bcc/build
+  cd bcc
+
+  git checkout v0.11.0
+  git submodule init
+  git submodule sync
+  git submodule update
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/opt/bcc
+  make -j$(nproc)
+  sudo make install
+  make clean
+  cd ..
+
+  V0_12_HASH=2d099cd8c5cb1598d6e911c0b389132ebc7c101b
+  git checkout $V0_12_HASH
+  git submodule init
+  git submodule sync
+  git submodule update
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/opt/bcc
+  make -j$(nproc)
+  sudo make install
+
+  cd /
+  cache has_key libbcc-so && cache clear libbcc-so
+  cache store libbcc-so opt/bcc
+  cd -
+fi
+cd $ORIG_DIR
+
+# link all tha objects under /lib from /opt/bcc
+sudo ln -sf /opt/bcc/lib/libbcc.so.0.11.0 /opt/bcc/lib/libbcc.so.0.12.0 /usr/lib/x86_64-linux-gnu/
+
+# Doing tests
+set -e
+
+bundle install --path vendor/bundle
+
+bundle exec ruby -e "require 'rbbcc'; puts 'Using rbbcc: %s && libbcc: %s' % [RbBCC::VERSION, RbBCC::Clib.libbcc_version.to_s]"
+if test "$(bundle exec ruby -e 'require %q(rbbcc); print RbBCC::Clib.libbcc_version.to_s')" != "${LIBBCC_VERSION}"; then
+  echo "Test target mismatch"
+  exit 127
+fi
+
+sudo -E env PATH=$PATH bundle exec rake test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbcc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: BCC port for MRI. See https://github.com/iovisor/bcc
 email:
 - udzura@udzura.jp
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".semaphore/semaphore.yml"
 - Dockerfile
 - Dockerfile.dfm-example
 - Gemfile
@@ -103,6 +118,7 @@ files:
 - lib/rbbcc/version.rb
 - misc/rbbcc-dfm-ruby
 - rbbcc.gemspec
+- semaphore.sh
 homepage: https://github.com/udzura/rbbcc
 licenses: []
 metadata: {}