Merge branch 'main' into 0.5.2

Author: omarabid

pyroscope_ffi/python/.gitignore

@@ -3,6 +3,7 @@
 
 # Packages
 *.egg
+.eggs/
 !/tests/**/*.egg
 */*.egg-info
 *.egg-info

pyroscope_ffi/python/Makefile

@@ -4,6 +4,7 @@ clean:
 	rm -rf dist
 	rm -rf wheelhouse
 	rm -rf pyroscope_beta.egg-info
+	rm -rf lib/target
 
 .PHONY: build
 build: clean

pyroscope_ffi/python/manylinux.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+set -e
+
+# Install tooling
+yum -y -q install wget gcc libffi-devel
+
+# Install Rust
+curl https://sh.rustup.rs -sSf | sh -s -- -y
+export PATH=~/.cargo/bin:$PATH
+
+# Install libunwind
+wget https://github.com/libunwind/libunwind/releases/download/v1.6.2/libunwind-1.6.2.tar.gz
+tar -zxvf libunwind-1.6.2.tar.gz
+cd libunwind-1.6.2
+./configure --disable-minidebuginfo --enable-ptrace --disable-tests --disable-documentation
+make
+make install
+
+# Build wheels
+/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
+
+# Audit wheels
+for wheel in dist/*-linux_*.whl; do
+  auditwheel repair $wheel -w dist/
+  rm $wheel
+done

pyroscope_ffi/python/lib/__init__.py renamed to pyroscope_ffi/python/requirements.txt

@@ -19,9 +19,11 @@ def build_native(spec):
                 in_path='target/release'),
             header_filename=lambda:
             build.find_header('pyroscope_ffi.h',in_path='include'),
-            rtld_flags=['NOW', 'NODELETE']
+            rtld_flags=['NOW']
     )
 
 setup(
+    platforms="any",
     milksnake_tasks=[build_native],
+    setup_requires=["milksnakex>=0.1.6"],
 )

pyroscope_ffi/python/setup.py

@@ -2,3 +2,4 @@
 .DS_Store
 **/target
 *.so
+tmp

pyroscope_ffi/ruby/.gitignore

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-load File.expand_path('./ext/rbspy/Rakefile', __dir__)
+require 'rake/extensiontask'
+
 load File.expand_path('./ext/thread_id/Rakefile', __dir__)
+load File.expand_path('./ext/rbspy/Rakefile', __dir__)
 
 task default: %w[hello]
 
 task :hello do
   puts 'Hello!'
 end
+
+Rake::ExtensionTask.new('thread_id')
+Rake::ExtensionTask.new('rbspy')

pyroscope_ffi/ruby/Rakefile

@@ -2,7 +2,7 @@
 
 require "shellwords"
 
-class RakeCargoHelper
+class RbspyRakeCargoHelper
   attr_reader :gemname
 
   def initialize(gemname=File.basename(__dir__))
@@ -104,54 +104,55 @@ class RakeCargoHelper
 
 end
 
-task default: [:install, :clean]
+task default: [:rbspy_install, :rbspy_clean]
+task rbspy: [:rbspy_install, :rbspy_clean]
 
 desc "set dev mode for subsequent task, run like `rake dev install`"
-task :dev do
+task :rbspy_dev do
   @dev = true
 end
 
 desc "build gem native extension and copy to lib"
-task install: [:cd, :build] do
-  helper = RakeCargoHelper.new
+task rbspy_install: [:rbspy_cd, :rbspy_build] do
+  helper = RbspyRakeCargoHelper.new
   profile_dir = @dev ? "debug" : "release"
-  source = File.join(RakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
+  source = File.join(RbspyRakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
   dest = File.join(helper.install_dir, helper.ruby_name)
   mkdir_p(helper.install_dir)
   rm(dest) if File.exist?(dest)
   cp(source, dest)
 end
 
 desc "build gem native extension"
-task build: [:cargo, :cd] do
-  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RakeCargoHelper.flags
+task rbspy_build: [:rbspy_cargo, :rbspy_cd] do
+  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RbspyRakeCargoHelper.flags
 end
 
 desc "clean up release build artifacts"
-task clean: [:cargo, :cd] do
+task rbspy_clean: [:rbspy_cargo, :rbspy_cd] do
   sh "cargo clean --release"
 end
 
 desc "clean up build artifacts"
-task clobber: [:cargo, :cd] do
+task rbspy_clobber: [:rbspy_cargo, :rbspy_cd] do
   sh "cargo clean"
 end
 
 desc "check for cargo"
-task :cargo do
-  raise <<-MSG unless RakeCargoHelper.command?("cargo")
+task :rbspy_cargo do
+  raise <<-MSG unless RbspyRakeCargoHelper.command?("cargo")
     This gem requires a Rust compiler and the `cargo' build tool to build the
     gem's native extension. See https://www.rust-lang.org/tools/install for
     how to install Rust. `cargo' is usually part of the Rust installation.
   MSG
 
-  raise <<-MSG if Gem.win_platform? && RakeCargoHelper.rust_toolchain !~ /gnu/
-    Found Rust toolchain `#{RakeCargoHelper.rust_toolchain}' but the gem native
+  raise <<-MSG if Gem.win_platform? && RbspyRakeCargoHelper.rust_toolchain !~ /gnu/
+    Found Rust toolchain `#{RbspyRakeCargoHelper.rust_toolchain}' but the gem native
     extension requires the gnu toolchain on Windows.
   MSG
 end
 
 # ensure task is running in the right dir
-task :cd do
+task :rbspy_cd do
   cd(__dir__) unless __dir__ == pwd
 end

pyroscope_ffi/ruby/ext/rbspy/Rakefile

@@ -1,11 +1,12 @@
 require 'mkmf'
+require 'rb_sys/mkmf'
 require 'rake'
 
-create_makefile('rbspy')
+create_rust_makefile('rbspy')
 
 app = Rake.application
 app.init
 app.add_import 'Rakefile'
 app.load_rakefile
 
-app['default'].invoke
+app['rbspy'].invoke

pyroscope_ffi/ruby/ext/rbspy/extconf.rb

@@ -2,7 +2,7 @@
 
 require "shellwords"
 
-class RakeCargoHelper
+class ThreadIdRakeCargoHelper
   attr_reader :gemname
 
   def initialize(gemname=File.basename(__dir__))
@@ -104,54 +104,55 @@ class RakeCargoHelper
 
 end
 
-task default: [:install, :clean]
+task default: [:thread_id_install, :thread_id_clean]
+task thread_id: [:thread_id_install, :thread_id_clean]
 
 desc "set dev mode for subsequent task, run like `rake dev install`"
-task :dev do
+task :thread_id_dev do
   @dev = true
 end
 
 desc "build gem native extension and copy to lib"
-task install: [:cd, :build] do
-  helper = RakeCargoHelper.new
+task thread_id_install: [:thread_id_cd, :thread_id_build] do
+  helper = ThreadIdRakeCargoHelper.new
   profile_dir = @dev ? "debug" : "release"
-  source = File.join(RakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
+  source = File.join(ThreadIdRakeCargoHelper.cargo_target_dir, profile_dir, helper.rust_name)
   dest = File.join(helper.install_dir, helper.ruby_name)
   mkdir_p(helper.install_dir)
   rm(dest) if File.exist?(dest)
   cp(source, dest)
 end
 
 desc "build gem native extension"
-task build: [:cargo, :cd] do
-  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *RakeCargoHelper.flags
+task thread_id_build: [:thread_id_cargo, :thread_id_cd] do
+  sh "cargo", "rustc", *(["--locked", "--release"] unless @dev), "--", *ThreadIdRakeCargoHelper.flags
 end
 
 desc "clean up release build artifacts"
-task clean: [:cargo, :cd] do
+task thread_id_clean: [:thread_id_cargo, :thread_id_cd] do
   sh "cargo clean --release"
 end
 
 desc "clean up build artifacts"
-task clobber: [:cargo, :cd] do
+task thread_id_clobber: [:thread_id_cargo, :thread_id_cd] do
   sh "cargo clean"
 end
 
 desc "check for cargo"
-task :cargo do
-  raise <<-MSG unless RakeCargoHelper.command?("cargo")
+task :thread_id_cargo do
+  raise <<-MSG unless ThreadIdRakeCargoHelper.command?("cargo")
     This gem requires a Rust compiler and the `cargo' build tool to build the
     gem's native extension. See https://www.rust-lang.org/tools/install for
     how to install Rust. `cargo' is usually part of the Rust installation.
   MSG
 
-  raise <<-MSG if Gem.win_platform? && RakeCargoHelper.rust_toolchain !~ /gnu/
-    Found Rust toolchain `#{RakeCargoHelper.rust_toolchain}' but the gem native
+  raise <<-MSG if Gem.win_platform? && ThreadIdRakeCargoHelper.rust_toolchain !~ /gnu/
+    Found Rust toolchain `#{ThreadIdRakeCargoHelper.rust_toolchain}' but the gem native
     extension requires the gnu toolchain on Windows.
   MSG
 end
 
 # ensure task is running in the right dir
-task :cd do
+task :thread_id_cd do
   cd(__dir__) unless __dir__ == pwd
 end