je 0.0.5 → 0.0.6

data/bin/je

@@ -1,19 +1,40 @@
 #!/usr/bin/env ruby
+require 'timeout'
 
 # Set ENV for preloading jemalloc
 lib_dir = File.expand_path('../lib/', File.dirname(__FILE__))
 if File.exists? (lib_dir + "/jemalloc.so")
   puts "=> Injecting jemalloc..."
   ENV.store("LD_PRELOAD", lib_dir + "/jemalloc.so")
+elsif File.exists? (lib_dir + "/jemalloc.bundle")
+  puts "=> Injecting jemalloc..."
+  ENV.store("DYLD_INSERT_LIBRARIES", lib_dir + "/jemalloc.bundle")
 else
   puts "=> Skip injecting jemalloc. Your platform is not supported."
 end
 
-# fork(2) and exec(2)
+# fork(2)
 pid = Process.fork
+
+# set signal handlerss
+def terminate_gracefully(pid)
+  begin
+    Process.kill("SIGTERM", pid) rescue Errno::ESRCH
+    Timeout.timeout(3) {
+      pid, status = Process.wait2
+      Kernel.exit (status.exitstatus || 0)
+    }
+  rescue Timeout::Error
+    Process.kill("SIGKILL", pid) rescue Errno::ESRCH
+  end
+end
+trap("INT") { puts "SIGINT received"; terminate_gracefully pid }
+trap("TERM") { puts "SIGTERM received"; terminate_gracefully pid }
+
+# exec(2)
 if pid.nil? then
   Kernel.exec *ARGV
 else
   pid, status = Process.wait2
-  Kernel.exit status.exitstatus
+  Kernel.exit (status.exitstatus || 0)
 end

data/ext/jemalloc/extconf.rb

@@ -1,10 +1,10 @@
 require 'mkmf'
 require 'rbconfig'
-require File.expand_path('../../lib/je/version', File.dirname(__FILE__))
 
 $stdout.sync = true
 pkg = "jemalloc-3.0.0"
 
+# monfigure and copy sources to cur_dir
 cur_dir = Dir.pwd
 Dir.chdir File.dirname(__FILE__) do
   # cleanup
@@ -13,12 +13,12 @@ Dir.chdir File.dirname(__FILE__) do
   Dir.chdir(pkg) do
     # configure
     puts `./configure`
-    # mkmf only allows *.c file on current dir
-    puts `cp src/*.c ../`
     # zone.c is only for Mac OS X
     if RbConfig::CONFIG['target_vendor'] != "apple"
-      puts `rm -fR ../zone.c`
+      puts `rm -fR src/zone.c`
     end
+    # mkmf only allows *.c files on current dir
+    puts `cp src/*.c #{cur_dir}`
   end
 end
 Dir.chdir cur_dir
@@ -27,3 +27,13 @@ include_dir= File.dirname(__FILE__) + "/#{pkg}/include/"
 $CFLAGS << %[ -std=gnu99 -Wall -pipe -g3 -fvisibility=hidden -O3 -funroll-loops -D_GNU_SOURCE -D_REENTRANT -I.. -I#{include_dir}]
 
 create_makefile('jemalloc')
+
+# modify Makefile to create .dylib, instead of .bundle
+# NOTICE: Mac OS X only
+if RbConfig::CONFIG['target_vendor'] == "apple"
+  makefile = open('Makefile').read
+  makefile.gsub!(/-dynamic\ -bundle/, '-shared')
+  makefile.gsub!(/-flat_namespace/, '-dylib_install_name')
+  #,-dylib_install_name
+  open('Makefile', 'w'){ |f| f.write(makefile) }
+end

data/lib/je/version.rb

@@ -1,3 +1,3 @@
 module JE
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: je
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler