rbbcc 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d467cf3f971af1d5a6cc25342768dc87c50edd97cc236fa2610e4de5a49fe45
-  data.tar.gz: 83495ff5a1dc88c671db426690e1075641cb50dd6734f078a8e082f32a148e4e
+  metadata.gz: a1911b0a6e9450e76b3fda2c56c45bfc17846638e1ca99e64e983d99f99dff64
+  data.tar.gz: e4841d103a87ee45ced700ea7dff562a305e1cbf1172ef35da40be063d4ee698
 SHA512:
-  metadata.gz: 35f38c830eb046b72da90dddff2e9f6e050a34b0c0bb82c372bdcc144ab82bab3ba3e8ec6450879f3d086f7d4437f99fdb55b54f4b204974c9fa0fb2940892bc
-  data.tar.gz: 9f14a1979cf8892920b443915f5773e743562ae5f391ed0e9bdbaa97d0524932f0c4fa1a5397f4987a0e5c4bf2d404755c6eb55bd0cd6a687279fcce4bc66e63
+  metadata.gz: fd3aba48720c19d46efa02eac50fd758e883306616bb14068e13c4062f8d8efd4f9852b2b5d7f8eded678a9954e36070cb13f2be99c271b6983ab8ec75e53807
+  data.tar.gz: 63170a77e06d0c15d5dac6eed68112232b475259fcce7a07f4c99ba21baf9df0e85faa307fa2c868afc4aea9888ac7b4779188f03e0cd40d0cbedfab28c41873

data/Gemfile.lock

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

data/docs/getting_started.md

@@ -4,7 +4,7 @@ RbBCC is a project to utilize the power of eBPF/BCC from Ruby.
 
 ## Setup
 
-RbBCC requires `libbcc.so` version **0.10.0**(we plan to support newer version of libbcc, but it may be done after rbbcc 1.0...).
+RbBCC requires `libbcc.so` version **0.11.0 or 0.10.0**(we plan to support newer version of libbcc, such as 0.12.0; but it may be done after rbbcc 1.0...).
 
 BTW we do not need to install header files, becuase current version of RbBCC uses the functionality of libbcc via ffi(We use MRI's standard library **fiddle**, not external gems).
 

data/examples/charty/Gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem "rbbcc", path: '../../'
+gem "charty", path: '/usr/local/ghq/github.com/udzura/charty'
+gem "unicode_plot"
+gem "numo"
+gem "matplotlib"

data/examples/charty/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: ../..
+  specs:
+    rbbcc (0.2.0)
+
+PATH
+  remote: /usr/local/ghq/github.com/udzura/charty
+  specs:
+    charty (0.2.2)
+      red-colors
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    enumerable-statistics (2.0.1)
+    matplotlib (1.1.0)
+      pycall (>= 1.0.0)
+    numo (0.1.1)
+      numo-fftw (~> 0.1.1)
+      numo-gnuplot (~> 0.2.4)
+      numo-gsl (~> 0.1.1)
+      numo-linalg (~> 0.1.0)
+      numo-narray (~> 0.9.1)
+    numo-fftw (0.1.1)
+      numo-narray (~> 0.9.0)
+    numo-gnuplot (0.2.4)
+    numo-gsl (0.1.2)
+      numo-narray (>= 0.9.0.8)
+    numo-linalg (0.1.5)
+      numo-narray (>= 0.9.1.4)
+    numo-narray (0.9.1.6)
+    pycall (1.3.0)
+    red-colors (0.1.1)
+    unicode_plot (0.0.4)
+      enumerable-statistics (>= 2.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  charty!
+  matplotlib
+  numo
+  rbbcc!
+  unicode_plot
+
+BUNDLED WITH
+   2.0.2

data/examples/charty/bitehist-unicode.rb

@@ -0,0 +1,87 @@
+#!/usr/bin/env ruby
+#
+# bitehist.rb, ported from bitehist.py. See license on that file
+#
+# Written as a basic example of using histograms to show a distribution.
+#
+# A Ctrl-C will print the gathered histogram then exit.
+#
+
+require 'rbbcc'
+include RbBCC
+
+b = BCC.new(text: <<CLANG)
+#include <uapi/linux/ptrace.h>
+#include <linux/blkdev.h>
+
+BPF_HISTOGRAM(dist);
+BPF_HISTOGRAM(dist_linear);
+
+int kprobe__blk_account_io_completion(struct pt_regs *ctx, struct request *req)
+{
+  dist.increment(bpf_log2l(req->__data_len / 1024));
+  dist_linear.increment(req->__data_len / 1024);
+  return 0;
+}
+CLANG
+
+puts "Tracing... Hit Ctrl-C to end."
+
+loop do
+  begin
+    sleep 0.1
+  rescue Interrupt
+    puts
+    break
+  end
+end
+
+require 'unicode_plot'
+def log2hist_unicode(table)
+  strip_leading_zero = true
+  vals = Array.new($log2_index_max) { 0 }
+  data = {}
+  table.each_pair do |k, v|
+    vals[k.to_bcc_value] = v.to_bcc_value
+  end
+
+  log2_dist_max = 64
+  idx_max = -1
+  val_max = 0
+
+  vals.each_with_index do |v, i|
+    idx_max = i if v > 0
+    val_max = v if v > val_max
+  end
+
+  (1...(idx_max + 1)).each do |i|
+    low = (1 << i) >> 1
+    high = (1 << i)
+    if (low == high)
+      low -= 1
+    end
+    val = vals[i]
+
+    if strip_leading_zero
+      if val
+        data["[#{low}, #{high})"] = val
+        strip_leading_zero = false
+      end
+    else
+      data["[#{low}, #{high})"] = val
+    end
+  end
+
+  unless data.empty?
+    puts UnicodePlot.barplot(ylabel: "kbytes", data: data, title: "log2 histogram", color: :magenta).render
+  else
+    puts "No sample found."
+  end
+end
+
+log2hist_unicode b["dist"]
+
+# puts
+# puts "linear histogram"
+# puts "~~~~~~~~~~~~~~~~"
+# b["dist_linear"].print_linear_hist("kbytes")

data/examples/tools/execsnoop.rb

@@ -57,7 +57,7 @@ parser.on_tail("-h", "--help", "show this help message and exit") do
 end
 
 parser.parse!
-args.max_arges ||= "20"
+args.max_args ||= "20"
 
 bpf_text = <<CLANG
 #include <uapi/linux/ptrace.h>

data/lib/rbbcc/bcc.rb

@@ -210,18 +210,18 @@ module RbBCC
       Clib.__extract_char ptr
     end
 
-    def load_func(func_name, prog_type)
+    def load_func(func_name, prog_type, device: nil)
       if @funcs.keys.include?(func_name)
         return @funcs[func_name]
       end
 
       log_level = 0
-      fd = Clib.bcc_func_load(@module, prog_type, func_name,
+      fd = Clib.do_bcc_func_load(@module, prog_type, func_name,
              Clib.bpf_function_start(@module, func_name),
              Clib.bpf_function_size(@module, func_name),
              Clib.bpf_module_license(@module),
              Clib.bpf_module_kern_version(@module),
-             log_level, nil, 0);
+             log_level, nil, 0, device);
       if fd < 0
         raise SystemCallError.new(Fiddle.last_error)
       end

data/lib/rbbcc/clib.rb

@@ -12,8 +12,29 @@ module RbBCC
       ptr.to_s
     end
 
+    def self.libbcc_version=(ver)
+      @@libbcc_version ||= Gem::Version.new(ver)
+    end
+
+    def self.libbcc_version
+      @@libbcc_version
+    end
+
+    def self.libbcc_version_gteq?(ver)
+      @@libbcc_version >= Gem::Version.new(ver)
+    end
+
     extend Fiddle::Importer
-    dlload "libbcc.so.0.10.0"
+    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"
+    end
     typealias "size_t", "int"
 
     extern 'void * bpf_module_create_c_from_string(char *, unsigned int, char **, int, long)'
@@ -21,7 +42,23 @@ module RbBCC
     extern 'char * bpf_function_name(void *, int)'
     extern 'void bpf_module_destroy(void *)'
 
-    extern 'int bcc_func_load(void *, int, char *, void *, int, char *, unsigned int, int, char *, unsigned int)'
+    if libbcc_version_gteq?("0.11.0")
+      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_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 'int bcc_func_load(void *, int, char *, void *, int, char *, unsigned int, int, char *, unsigned int)'
+      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
+    end
+
     extern 'void * bpf_function_start(void *, char *)'
     extern 'int bpf_function_size(void *, char *)'
     extern 'char * bpf_module_license(void *)'

data/lib/rbbcc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbcc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Uchio Kondo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,9 @@ files:
 - docs/README.md
 - docs/getting_started.md
 - examples/bitehist.rb
+- examples/charty/Gemfile
+- examples/charty/Gemfile.lock
+- examples/charty/bitehist-unicode.rb
 - examples/dddos.rb
 - examples/disksnoop.rb
 - examples/example.gif
@@ -118,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: BCC port for MRI