hrr_rb_lxns 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f96ad9d7f1439e815c23aebf272ff8ca0984dba7ec9775e22483d33a390e82b1
-  data.tar.gz: 0eba5185a5c6c23660b69acd7982b5982830a50e2dad726b09c1f89f93325780
+  metadata.gz: 22886b993b258c672b8f37d59c51108e40027365f5932fe5ae841ec4ccfe4735
+  data.tar.gz: 0e04c670687c4575bec9e874d5f0748e280452f387ebe9ea7cbd9a06a82823ad
 SHA512:
-  metadata.gz: af3f529c576999c3f11371b0ea4ffaf59ad62f0500185a3b238026d41744251732f24d1123590f981d9eeb260188599358b626fd634d69f25a13aafe5cfbb694
-  data.tar.gz: d28a267db5871149c88a145aef192612d8f007826670ded888b5a96836593211431cf4d038e6fb314427ccefdc3dba7dd5b3439b14374f36a6d813dad201a0da
+  metadata.gz: b55815a702403feff42698e15b8ada181bf32ac2da3362331b8cf87ccc8f5413462896f1a63181a3736954f743659f4e0d56004919c5bfbbb8774559a6211a92
+  data.tar.gz: 114b6d13402c24de77662525bfee59c6d3f7e02b680a76903f3810238cdd2ac91ce99cd5096dcbb22e195d9287d7252ecf1b86a6476c170eea1903abf2c3e98e

data/ext/hrr_rb_lxns/hrr_rb_lxns.c

@@ -1,6 +1,7 @@
 #include "hrr_rb_lxns.h"
 #define _GNU_SOURCE 1
 #include <sched.h>
+#include <linux/version.h>
 
 VALUE rb_mHrrRbLxns;
 VALUE rb_mHrrRbLxnsConst;
@@ -107,6 +108,11 @@ Init_hrr_rb_lxns(void)
   /* Represents cgroup namespace. */
   rb_define_const(rb_mHrrRbLxnsConst, "NEWCGROUP", INT2FIX(CLONE_NEWCGROUP));
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
+# ifndef CLONE_NEWTIME
+#  define CLONE_NEWTIME	0x00000080
+# endif
+#endif
 #ifdef CLONE_NEWTIME
   /* Represents time namespace. */
   rb_define_const(rb_mHrrRbLxnsConst, "NEWTIME", INT2FIX(CLONE_NEWTIME));

data/lib/hrr_rb_lxns.rb

@@ -166,20 +166,19 @@ module HrrRbLxns
           io_w.write "1"
           io_w.close
           if pid_to_bind == Process.pid
-            _, status = Process.waitpid2 pid
-            raise Marshal.load(io_r.read) if status.exitstatus != 0
+            Process.waitpid pid
+            raise Marshal.load(io_r.read) unless $?.to_i.zero?
           end
           ret
         else
           begin
-            exit_status = true
             io_r.read 1
             bind_ns_files flags, options, pid_to_bind
           rescue Exception => e
-            exit_status = false
             io_w.write Marshal.dump(e)
-          ensure
-            exit! exit_status
+            exit! false
+          else
+            exit! true
           end
         end
       ensure
@@ -200,17 +199,14 @@ module HrrRbLxns
 
   def self.bind_ns_files flags, options, pid
     list = Array.new
-    list.push ["ipc",    NEWIPC,    :ipc    ] if const_defined?(:NEWIPC)
-    list.push ["mnt",    NEWNS,     :mount  ] if const_defined?(:NEWNS)
-    list.push ["net",    NEWNET,    :network] if const_defined?(:NEWNET)
-    list.push ["pid",    NEWPID,    :pid    ] if const_defined?(:NEWPID)
-    if File.exist? "/proc/#{pid}/ns/pid_for_children"
-      list.last[0] = "pid_for_children"
-    end
-    list.push ["uts",    NEWUTS,    :uts    ] if const_defined?(:NEWUTS)
-    list.push ["user",   NEWUSER,   :user   ] if const_defined?(:NEWUSER)
-    list.push ["cgroup", NEWCGROUP, :cgroup ] if const_defined?(:NEWCGROUP)
-    list.push ["time",   NEWTIME,   :time   ] if const_defined?(:NEWTIME)
+    list.push ["ipc",               NEWIPC,    :ipc    ] if const_defined?(:NEWIPC)
+    list.push ["mnt",               NEWNS,     :mount  ] if const_defined?(:NEWNS)
+    list.push ["net",               NEWNET,    :network] if const_defined?(:NEWNET)
+    list.push ["pid_for_children",  NEWPID,    :pid    ] if const_defined?(:NEWPID)
+    list.push ["uts",               NEWUTS,    :uts    ] if const_defined?(:NEWUTS)
+    list.push ["user",              NEWUSER,   :user   ] if const_defined?(:NEWUSER)
+    list.push ["cgroup",            NEWCGROUP, :cgroup ] if const_defined?(:NEWCGROUP)
+    list.push ["time_for_children", NEWTIME,   :time   ] if const_defined?(:NEWTIME)
     list.each do |name, flag, key|
       if (flags & flag).zero?.! && options[key]
         HrrRbMount.bind "/proc/#{pid}/ns/#{name}", options[key]
@@ -219,11 +215,11 @@ module HrrRbLxns
   end
 
   def self.do_setns nstype_file_h
-    nstype_file_h.each do |nstype, file|
+    nstype_file_h.map{ |nstype, file|
       File.open(file, File::RDONLY) do |f|
         __setns__ f.fileno, nstype
       end
-    end
+    }.max or 0
   end
 
   def self.get_nstype_file_h flags, pid, options

data/lib/hrr_rb_lxns/version.rb

@@ -1,3 +1,3 @@
 module HrrRbLxns
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_lxns
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hrr_rb_mount
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Utilities working with Linux namespaces for CRuby.