bootsnap 1.1.0.pre-java → 1.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ed6de82125b74db129cadfca1d981483cda326
-  data.tar.gz: 3a71063dc3ba38f604718aca731933029a984465
+  metadata.gz: 622dbeab469dbcd40ec9e8c93d73e6ff01aa2d6c
+  data.tar.gz: 1f50bce28e945662a13ad63592352d64d77273be
 SHA512:
-  metadata.gz: e8834a384a8c48454521b0186aa023e5ece9227383b24624b88620c4732fb8466fddf7bdd8ecd19494cf52d6a64fd9d3c0a09af93274ede44f07928c5338bf2f
-  data.tar.gz: 631c6b34200beba552a1fa6b49185c514182014302ce0a8c8cd0985c338d812108ebfa7dab8274d4d3a10896e909ab4eb8958c9676bda4dffb4f2cdc5abf03e9
+  metadata.gz: 117a042e1ccbaef389ff7e9ed121ae3c0125544400dc3678cabe7dabb1568e4650d89b17738cc2a8dfa909ed20ee5186a59fec3df83d99753a6f89343018e910
+  data.tar.gz: b4aac5d35a0c8eba3a238d82ec076707917373d7dfa0c0b232cef22e0d499e72a584bb937886e260fe8817ce9e003f74bf6d91b641b2cc2bdd08febf6192b235

data/CHANGELOG.md

@@ -1,7 +1,13 @@
+# 1.1.1
+
+* Fix crash in `Native.compile_option_crc32=` on 32-bit platforms.
+
 # 1.1.0
 
 * Add `bootsnap/setup`
 * Support jruby (without compile caching features)
+* Better deoptimization when Coverage is enabled
+* Consider `Bundler.bundle_path` to be stable
 
 # 1.0.0
 

data/README.md

@@ -1,11 +1,11 @@
-# Bootsnap ![CI status](https://travis-ci.org/Shopify/bootsnap.svg?branch=master)
+# Bootsnap [![Build Status](https://travis-ci.org/Shopify/bootsnap.svg?branch=master)](https://travis-ci.org/Shopify/bootsnap)
 
 **Beta-quality. See [the last section of this README](#trustworthiness).**
 
-Bootsnap is a library that plugs into a number of Ruby and (optionally) `ActiveSupport` and `YAML`
-methods to optimize and cache expensive computations. See [the How Does This Work section](#how-does-this-work) for more information.
+Bootsnap is a library that plugs into Ruby, with optional support for `ActiveSupport` and `YAML`,
+to optimize and cache expensive computations. See [How Does This Work](#how-does-this-work).
 
-#### Quick Performance Overview
+#### Performance
 - [Discourse](https://github.com/discourse/discourse) reports a boot time reduction of approximately 50%, from roughly 6 to 3 seconds on one machine;
 - One of our smaller internal apps also sees a reduction of 50%, from 3.6 to 1.8 seconds;
 - The core Shopify platform -- a rather large monolithic application -- boots about 75% faster, dropping from around 25s to 6.5s.
@@ -32,14 +32,15 @@ this is loaded, the sooner it can start optimizing things)
 
 ```ruby
 require 'bootsnap'
+env = ENV['RAILS_ENV'] || "development"
 Bootsnap.setup(
-  cache_dir:            'tmp/cache',                       # Path to your cache
-  development_mode:     ENV['RAILS_ENV'] == 'development', # This should be set to whatever evaluates your current working environment, e.g. RACK_ENV, RAILS_ENV, etc
-  load_path_cache:      true,                              # Should we optimize the LOAD_PATH with a cache?
-  autoload_paths_cache: true,                              # Should we optimize ActiveSupport autoloads with cache?
-  disable_trace:        false,                             # Sets `RubyVM::InstructionSequence.compile_option = { trace_instruction: false }`
-  compile_cache_iseq:   true,                              # Should compile Ruby code into ISeq cache?
-  compile_cache_yaml:   true                               # Should compile YAML into a cache?
+  cache_dir:            'tmp/cache',          # Path to your cache
+  development_mode:     env == 'development', # Current working environment, e.g. RACK_ENV, RAILS_ENV, etc
+  load_path_cache:      true,                 # Optimize the LOAD_PATH with a cache
+  autoload_paths_cache: true,                 # Optimize ActiveSupport autoloads with cache
+  disable_trace:        true,                 # (Alpha) Set `RubyVM::InstructionSequence.compile_option = { trace_instruction: false }`
+  compile_cache_iseq:   true,                 # Compile Ruby code into ISeq cache, breaks coverage reporting.
+  compile_cache_yaml:   true                  # Compile YAML into a cache
 )
 ```
 
@@ -49,8 +50,7 @@ will help optimize boot time further if you have an extremely large `$LOAD_PATH`
 
 ## How does this work?
 
-Bootsnap is a library that plugs into a number of Ruby and (optionally) `ActiveSupport` and `YAML`
-methods. These methods are modified to cache results of expensive computations, and can be grouped
+Bootsnap optimizes methods to cache results of expensive computations, and can be grouped
 into two broad categories:
 
 * [Path Pre-Scanning](#path-pre-scanning)
@@ -110,7 +110,8 @@ entries do not expire -- once their contents has been scanned, it is assumed to
 
 The only directories considered "stable" are things under the Ruby install prefix
 (`RbConfig::CONFIG['prefix']`, e.g. `/usr/local/ruby` or `~/.rubies/x.y.z`), and things under the
-`Gem.path` (e.g. `~/.gem/ruby/x.y.z`). Everything else is considered "volatile".
+`Gem.path` (e.g. `~/.gem/ruby/x.y.z`) or `Bundler.bundle_path`. Everything else is considered
+"volatile".
 
 In addition to the [`Bootsnap::LoadPathCache::Cache`
 source](https://github.com/Shopify/bootsnap/blob/master/lib/bootsnap/load_path_cache/cache.rb),

data/bootsnap.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake-compiler', '~> 0'
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "mocha", "~> 1.2"
-  spec.add_development_dependency "ffi-xattr", "~> 0.1.2"
 
   spec.add_runtime_dependency "msgpack", "~> 1.0"
 end

data/ext/bootsnap/bootsnap.c

@@ -18,7 +18,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#ifndef _WIN32
 #include <sys/utsname.h>
+#endif
 
 /* 1000 is an arbitrary limit; FNV64 plus some slashes brings the cap down to
  * 981 for the cache dir */
@@ -109,6 +111,15 @@ struct s2o_data;
 struct i2o_data;
 struct i2s_data;
 
+/* https://bugs.ruby-lang.org/issues/13667 */
+extern VALUE rb_get_coverages(void);
+static VALUE
+bs_rb_coverage_running(VALUE self)
+{
+  VALUE cov = rb_get_coverages();
+  return RTEST(cov) ? Qtrue : Qfalse;
+}
+
 /*
  * Ruby C extensions are initialized by calling Init_<extname>.
  *
@@ -129,6 +140,7 @@ Init_bootsnap(void)
 
   uncompilable = rb_intern("__bootsnap_uncompilable__");
 
+  rb_define_module_function(rb_mBootsnap_CompileCache_Native, "coverage_running?", bs_rb_coverage_running, 0);
   rb_define_module_function(rb_mBootsnap_CompileCache_Native, "fetch", bs_rb_fetch, 3);
   rb_define_module_function(rb_mBootsnap_CompileCache_Native, "compile_option_crc32=", bs_compile_option_crc32_set, 1);
 }
@@ -136,12 +148,17 @@ Init_bootsnap(void)
 /*
  * Bootsnap's ruby code registers a hook that notifies us via this function
  * when compile_option changes. These changes invalidate all existing caches.
+ *
+ * Note that on 32-bit platforms, a CRC32 can't be represented in a Fixnum, but
+ * can be represented by a uint.
  */
 static VALUE
 bs_compile_option_crc32_set(VALUE self, VALUE crc32_v)
 {
-  Check_Type(crc32_v, T_FIXNUM);
-  current_compile_option_crc32 = FIX2UINT(crc32_v);
+  if (!RB_TYPE_P(crc32_v, T_BIGNUM) && !RB_TYPE_P(crc32_v, T_FIXNUM)) {
+    Check_Type(crc32_v, T_FIXNUM);
+  }
+  current_compile_option_crc32 = NUM2UINT(crc32_v);
   return Qnil;
 }
 
@@ -176,6 +193,9 @@ fnv1a_64(const char *str)
 static uint32_t
 get_os_version(void)
 {
+  #ifdef _WIN32
+  return (uint32_t)GetVersion();
+  #else
   uint64_t hash;
   struct utsname utsname;
 
@@ -185,6 +205,7 @@ get_os_version(void)
   hash = fnv1a_64(utsname.version);
 
   return (uint32_t)(hash >> 32);
+  #endif
 }
 
 /*
@@ -265,6 +286,9 @@ open_current_file(char * path, struct bs_cache_key * key)
 
   fd = open(path, O_RDONLY);
   if (fd < 0) return fd;
+  #ifdef _WIN32
+  setmode(fd, O_BINARY);
+  #endif
 
   if (fstat(fd, &statbuf) < 0) {
     close(fd);
@@ -321,6 +345,9 @@ open_cache_file(const char * path, struct bs_cache_key * key)
     if (errno == ENOENT) return CACHE_MISSING_OR_INVALID;
     return ERROR_WITH_ERRNO;
   }
+  #ifdef _WIN32
+  setmode(fd, O_BINARY);
+  #endif
 
   res = bs_read_key(fd, key);
   if (res < 0) {
@@ -393,7 +420,11 @@ mkpath(char * file_path, mode_t mode)
   char * p;
   for (p = strchr(file_path + 1, '/'); p; p = strchr(p + 1, '/')) {
     *p = '\0';
+    #ifdef _WIN32
+    if (mkdir(file_path) == -1) {
+    #else
     if (mkdir(file_path, mode) == -1) {
+    #endif
       if (errno != EEXIST) {
         *p = '/';
         return -1;
@@ -428,6 +459,9 @@ atomic_write_cache_file(char * path, struct bs_cache_key * key, VALUE data)
     fd = open(tmp_path, O_WRONLY | O_CREAT, 0644);
     if (fd < 0) return -1;
   }
+  #ifdef _WIN32
+  setmode(fd, O_BINARY);
+  #endif
 
   key->data_size = RSTRING_LEN(data);
   nwrite = write(fd, key, KEY_SIZE);

data/lib/bootsnap/compile_cache/iseq.rb

@@ -12,12 +12,6 @@ module Bootsnap
         RubyVM::InstructionSequence.compile_file(path).to_binary
       rescue SyntaxError
         raise Uncompilable, 'syntax error'
-      rescue RuntimeError => e
-        if e.message == 'should not compile with coverage'
-          raise Uncompilable, 'coverage is enabled'
-        else
-          raise
-        end
       end
 
       def self.storage_to_output(binary)
@@ -37,6 +31,9 @@ module Bootsnap
 
       module InstructionSequenceMixin
         def load_iseq(path)
+          # Having coverage enabled prevents iseq dumping/loading.
+          return nil if defined?(Coverage) && Bootsnap::CompileCache::Native.coverage_running?
+
           Bootsnap::CompileCache::Native.fetch(
             Bootsnap::CompileCache::ISeq.cache_dir,
             path.to_s,
@@ -47,18 +44,6 @@ module Bootsnap
             puts "unmatched platform for file #{path}"
           end
           raise
-        rescue Errno::ERANGE
-          STDERR.puts <<~EOF
-            \x1b[31mError loading ISeq from cache for \x1b[1;34m#{path}\x1b[0;31m!
-            You can likely fix this by running:
-              \x1b[1;32mxattr -c #{path}
-            \x1b[0;31m...but, first, please make sure \x1b[1;34m@burke\x1b[0;31m knows you ran into this bug!
-            He will want to see the results of:
-              \x1b[1;32m/bin/ls -l@ #{path}
-            \x1b[0;31mand:
-              \x1b[1;32mxattr -p user.aotcc.key #{path}\x1b[0m
-          EOF
-          raise
         end
 
         def compile_option=(hash)

data/lib/bootsnap/load_path_cache/cache.rb

@@ -48,7 +48,7 @@ module Bootsnap
       def find(feature)
         reinitialize if (@has_relative_paths && dir_changed?) || stale?
         feature = feature.to_s
-        return feature if feature.start_with?(SLASH)
+        return feature if absolute_path?(feature)
         return File.expand_path(feature) if feature.start_with?('./')
         @mutex.synchronize do
           x = search_index(feature)
@@ -85,6 +85,16 @@ module Bootsnap
         end
       end
 
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+        def absolute_path?(path)
+          path[1] == ':'
+        end
+      else
+        def absolute_path?(path)
+          path.start_with?(SLASH)
+        end
+      end
+
       def unshift_paths(sender, *paths)
         return unless sender == @path_obj
         @mutex.synchronize { unshift_paths_locked(*paths) }

data/lib/bootsnap/load_path_cache/path.rb

@@ -99,6 +99,8 @@ module Bootsnap
         @stability ||= begin
           if Gem.path.detect { |p| expanded_path.start_with?(p.to_s) }
             STABLE
+          elsif expanded_path.start_with?(Bundler.bundle_path.to_s)
+            STABLE
           elsif expanded_path.start_with?(RUBY_LIBDIR) && !expanded_path.start_with?(RUBY_SITEDIR)
             STABLE
           else

data/lib/bootsnap/version.rb

@@ -1,3 +1,3 @@
 module Bootsnap
-  VERSION = "1.1.0.pre"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre
+  version: 1.1.1
 platform: java
 authors:
 - Burke Libbey
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  name: ffi-xattr
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -162,9 +148,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8