posix-spawn 0.3.11 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f593fc74a9f8637ea2c1dbfa897a805d6f87c0fe
-  data.tar.gz: 89a1a14ec837e06d68e85af34e56e956a976df30
+  metadata.gz: 586d0f0f9057e34308bf74b8012308d58554be84
+  data.tar.gz: fc46031fe4302b9c09bac390c758006e06d42a14
 SHA512:
-  metadata.gz: 33b05adfe9baf71faabd10e25e434c03e6aac674b4d9d05a6b79e1f8972a34aeacba3bb7b40598355fc9aa4c455049eeb0b3f6c00f7790d906f1ef01bb1799fe
-  data.tar.gz: 75ab91856b7ee41fad74bf2be66096d2667f8fbe888d5c7d67ab364c5033438ceb8e1f1a6b0e9f99cd120da4b65ca9486f2177b1bf4aa51ad7463229102e6dc1
+  metadata.gz: 41c48ddad2fb6bd679db842a9ab7afb37b0c07963b143e8c3e9537a48216b0b61a7761c2f2214fdfd5f30072c9d0429717aa65cfc2e005e1797a7b2802486391
+  data.tar.gz: f18771b44bff3cf3ce268abb4969ab2a4750df248bcab1ed027fcb84e475b1172aaadfb7051451dda475391cfeabfe8100fd4b1dc818ba82d7e20f9bfcd82188

data/COPYING

@@ -20,9 +20,3 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER  IN  AN
 ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN  THE
 SOFTWARE.
-
-A small portion of the environ dup'ing code in ext/posix-spawn.c
-was taken from glibc <http://www.gnu.org/s/libc/> and is maybe
-Copyright (c) 2011 by The Free Software Foundation or maybe
-by others mentioned in the glibc LICENSES file. glibc is
-distributed under the terms of the LGPL license.

data/bin/posix-spawn-benchmark

@@ -1,117 +1,17 @@
 #!/usr/bin/env ruby
-#/ Usage: posix-spawn-benchmark [-n <count>] [-m <mem-size>]
-#/ Run posix-spawn (Ruby extension) benchmarks and report to standard output.
-#/
-#/ Options:
-#/   -n, --count=NUM         total number of processes to spawn.
-#/   -m, --mem-size=MB       RES size to bloat to before performing benchmarks.
-#/   -g, --graph             benchmark at 10MB itervals up to RES and graph results.
-#/
-#/ Benchmarks run with -n 1000 -m 100 by default.
-require 'optparse'
-require 'posix-spawn'
-require 'benchmark'
-include Benchmark
-
-allocate   = 100 * (1024 ** 2)
-iterations = 1_000
-graphmode  = false
-ARGV.options do |o|
-  o.set_summary_indent('  ')
-  o.on("-n", "--count=num")   { |val| iterations = val.to_i }
-  o.on("-m", "--mem-size=MB") { |val| allocate   = val.to_i * (1024 ** 2) }
-  o.on("-g", "--graph")       { graphmode = true }
-  o.on_tail("-h", "--help")   { exec "grep ^#/ <'#{__FILE__}' |cut -c4-" }
-  o.parse!
-end
-
-if graphmode
-  bloat = []
-  data  = {}
-  chunk = allocate / 10
-  max   = 0
-
-  10.times do
-    puts "allocating #{chunk / (1024 ** 2)}MB (#{(bloat.size+1) * chunk / (1024 ** 2)}MB total)"
-    bloat << ('x' * chunk)
-    # size = bloat.size / (1024 ** 2)
-
-    %w[ fspawn pspawn ].each do |type|
-      print " - benchmarking #{type}... "
-      time = Benchmark.realtime do
-        iterations.times do
-          pid = POSIX::Spawn.send(type, 'true')
-          Process.wait(pid)
-        end
-      end
-      puts "done (#{time})"
-
-      data[type] ||= []
-      data[type] << time
-      max = time if time > max
-    end
-  end
-
-  max = max < 0.5 ? (max * 10).round / 10.0 : max.ceil
-  minmb, maxmb = chunk/(1024**2), allocate/(1024**2)
-  series = %w[ fspawn pspawn ].map{|name| data[name].map{|d| "%.2f" % d }.join(',') }
-
-  chart = {
-    :chs  => '900x200',
-    :cht  => 'bvg', # grouped vertical bar chart
-    :chtt => "posix-spawn-benchmark --graph --count #{iterations} --mem-size #{maxmb} (#{RUBY_PLATFORM})",
-
-    :chf  => 'bg,s,f8f8f8', # background
-    :chbh => 'a,5,25', # 25px between bar groups
-
-    :chd  => "t:#{series.join('|')}", # data
-    :chds => "0,#{max}", # scale
-    :chdl => 'fspawn (fork+exec)|pspawn (posix_spawn)', # legend
-    :chco => '1f77b4,ff7f0e', # colors
-
-    :chxt => 'x,y',
-    :chxr => "1,0,#{max},#{max/5}", # y labels up to max time
-    :chxs => '1N** secs', # y labels are +=' secs'
-    :chxl => "0:|#{minmb.step(maxmb, maxmb/10).map{ |mb| "#{mb} MB"}.join('|')}", # x bucket labels
-  }
-
-  url  = "https://chart.googleapis.com/chart?"
-  url += chart.map do |key, val|
-    "#{key}=#{val.gsub(' ','%20').gsub('(','%28').gsub(')','%29').gsub('+','%2B')}"
-  end.join('&')
-  url += '#.png'
-
-  puts url
-
-  exit!
-end
-
-puts "benchmarking fork/exec vs. posix_spawn over #{iterations} runs" +
-     " at #{allocate / (1024 ** 2)}M res"
-
-# bloat the process
-bloat = 'x' * allocate
-
-# run the benchmarks
-bm 40 do |x|
-  x.report("fspawn (fork/exec):") do
-    iterations.times do
-      pid = POSIX::Spawn.fspawn('true')
-      Process.wait(pid)
-    end
-  end
-  x.report("pspawn (posix_spawn):") do
-    iterations.times do
-      pid = POSIX::Spawn.pspawn('true')
-      Process.wait(pid)
-    end
-  end
-  if Process.respond_to?(:spawn)
-    x.report("spawn (native):") do
-      iterations.times do
-        pid = Process.spawn('true')
-        Process.wait(pid)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'posix-spawn-benchmark' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("posix-spawn", "posix-spawn-benchmark")

data/ext/posix-spawn.c

@@ -45,7 +45,7 @@ static VALUE rb_mPOSIXSpawn;
  *       an actual fd number:
  *         - The symbols :in, :out, or :err for fds 0, 1, or 2.
  *         - An IO object. (IO#fileno is returned)
- *         - A Fixnum.
+ *         - An Integer.
  *
  * Returns the fd number >= 0 if one could be established, or -1 if the object
  * does not map to an fd.
@@ -56,8 +56,12 @@ posixspawn_obj_to_fd(VALUE obj)
 	int fd = -1;
 	switch (TYPE(obj)) {
 		case T_FIXNUM:
-			/* Fixnum fd number */
-			fd = FIX2INT(obj);
+		case T_BIGNUM:
+			/* Integer fd number
+			 * rb_fix2int takes care of raising if the provided object is a
+			 * Bignum and is out of range of an int
+			 */
+			fd = (int)rb_fix2int(obj);
 			break;
 
 		case T_SYMBOL:
@@ -94,7 +98,7 @@ posixspawn_obj_to_fd(VALUE obj)
 /*
  * Hash iterator that sets up the posix_spawn_file_actions_t with addclose
  * operations. Only hash pairs whose value is :close are processed. Keys may
- * be the :in, :out, :err, an IO object, or a Fixnum fd number.
+ * be the :in, :out, :err, an IO object, or an Integer fd number.
  *
  * Returns ST_DELETE when an addclose operation was added; ST_CONTINUE when
  * no operation was performed.
@@ -269,27 +273,22 @@ each_env_check_i(VALUE key, VALUE val, VALUE arg)
 static int
 each_env_i(VALUE key, VALUE val, VALUE arg)
 {
-	char *name = StringValuePtr(key);
-	size_t len = strlen(name);
+	const char *name = StringValuePtr(key);
+	const size_t name_len = strlen(name);
 
-	/*
-	 * Delete any existing values for this variable before inserting the new value.
-	 * This implementation was copied from glibc's unsetenv().
-	 */
-	char **ep = (char **)arg;
-	while (*ep != NULL)
-		if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-		{
-			/* Found it.  Remove this pointer by moving later ones back.  */
-			char **dp = ep;
-
-			do
-				dp[0] = dp[1];
-			while (*dp++);
-			/* Continue the loop in case NAME appears again.  */
+	char **envp = (char **)arg;
+	size_t i, j;
+
+	for (i = 0; envp[i];) {
+		const char *ev = envp[i];
+
+		if (strlen(ev) > name_len && !memcmp(ev, name, name_len) && ev[name_len] == '=') {
+			for (j = i; envp[j]; ++j)
+				envp[j] = envp[j + 1];
+			continue;
 		}
-		else
-			++ep;
+		i++;
+	}
 
 	/*
 	 * Insert the new value if we have one. We can assume there is space
@@ -301,15 +300,15 @@ each_env_i(VALUE key, VALUE val, VALUE arg)
 		char *cval = StringValuePtr(val);
 
 		size_t cval_len = strlen(cval);
-		size_t ep_len = len + 1 + cval_len + 1; /* +2 for null terminator and '=' separator */
+		size_t ep_len = name_len + 1 + cval_len + 1; /* +2 for null terminator and '=' separator */
 
 		/* find the last entry */
 		while (*ep != NULL) ++ep;
 		*ep = malloc(ep_len);
 
-		strncpy(*ep, name, len);
-		(*ep)[len] = '=';
-		strncpy(*ep + len + 1, cval, cval_len);
+		strncpy(*ep, name, name_len);
+		(*ep)[name_len] = '=';
+		strncpy(*ep + name_len + 1, cval, cval_len);
 		(*ep)[ep_len-1] = 0;
 	}
 
@@ -373,6 +372,7 @@ rb_posixspawn_pspawn(VALUE self, VALUE env, VALUE argv, VALUE options)
 
 		if (RHASH_SIZE(env) > 0) {
 			int size = 0;
+			char **new_env;
 
 			char **curr = environ;
 			if (curr) {
@@ -387,7 +387,7 @@ rb_posixspawn_pspawn(VALUE self, VALUE env, VALUE argv, VALUE options)
 				size = 0;
 			}
 
-			char **new_env = calloc(size+RHASH_SIZE(env)+1, sizeof(char*));
+			new_env = calloc(size+RHASH_SIZE(env)+1, sizeof(char*));
 			for (i = 0; i < size; i++) {
 				new_env[i] = strdup(environ[i]);
 			}

data/lib/posix/spawn/child.rb

@@ -158,7 +158,7 @@ module POSIX
 
         # grab exit status
         @status = waitpid(pid)
-      rescue Object => boom
+      rescue Object
         [stdin, stdout, stderr].each { |fd| fd.close rescue nil }
         if @status.nil?
           if !@pgroup_kill
@@ -197,7 +197,6 @@ module POSIX
       def read_and_write(input, stdin, stdout, stderr, timeout=nil, max=nil)
         max = nil if max && max <= 0
         @out, @err = '', ''
-        offset = 0
 
         # force all string and IO encodings to BINARY under 1.9 for now
         if @out.respond_to?(:force_encoding) and stdin.respond_to?(:set_encoding)

data/lib/posix/spawn/version.rb

@@ -1,5 +1,5 @@
 module POSIX
   module Spawn
-    VERSION = '0.3.11'
+    VERSION = '0.3.13'
   end
 end

data/lib/posix/spawn.rb

@@ -85,7 +85,7 @@ module POSIX
   #
   #     spawn(command, :chdir => "/var/tmp")
   #
-  # The :in, :out, :err, a Fixnum, an IO object or an Array option specify
+  # The :in, :out, :err, an Integer, an IO object or an Array option specify
   # fd redirection. For example, stderr can be merged into stdout as follows:
   #
   #     spawn(command, :err => :out)
@@ -460,11 +460,11 @@ module POSIX
 
     # Determine whether object is fd-like.
     #
-    # Returns true if object is an instance of IO, Fixnum >= 0, or one of the
+    # Returns true if object is an instance of IO, Integer >= 0, or one of the
     # the symbolic names :in, :out, or :err.
     def fd?(object)
       case object
-      when Fixnum
+      when Integer
         object >= 0
       when :in, :out, :err, STDIN, STDOUT, STDERR, $stdin, $stdout, $stderr, IO
         true
@@ -486,7 +486,7 @@ module POSIX
         STDOUT
       when :err, 2
         STDERR
-      when Fixnum
+      when Integer
         object >= 0 ? IO.for_fd(object) : nil
       when IO
         object

data/posix-spawn.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.authors = ['Ryan Tomayko', 'Aman Gupta']
   s.email = ['r@tomayko.com', 'aman@tmm1.net']
-  s.licenses = ['MIT', 'LGPL']
+  s.licenses = ['MIT']
 
   s.add_development_dependency 'rake-compiler', '0.7.6'
   s.add_development_dependency 'minitest', '>= 4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: posix-spawn
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.13
 platform: ruby
 authors:
 - Ryan Tomayko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -75,7 +75,6 @@ files:
 homepage: https://github.com/rtomayko/posix-spawn
 licenses:
 - MIT
-- LGPL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -93,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: posix_spawnp(2) for ruby