etc 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f5196e40206894d4fc74d486106863f351e131e89fa6017807542361a09c617
-  data.tar.gz: 131ade148fb05d021a9956ee282722012abbc0607f87bfa15bd06a0374264a4a
+  metadata.gz: 4c60b51f5cf5237e306c210a1912bd9feb1c7a75bc7bd5d87b2b2ba2c6e82c01
+  data.tar.gz: fc93add02caa73345c5b0ed48209a1307275189447ab95f1078df8f5ee362dc8
 SHA512:
-  metadata.gz: 210712686ace4800e20dbc1c4f97ead9a352f6d65dc794bb0033f55da286ec730bef1269f5b9479b4f600a87a55a31470f7596b83ddc705aeb5f194618646e37
-  data.tar.gz: aa0cba8840eb405a1b80339d82c44b2c582e97b2cab1db8d7ad05f315ac1a78325c421698b94a53283302702f5ea2a669221bfbf84f0be88bf880fc863ade405
+  metadata.gz: 1cb34202dcb7a18d708b07967d2db958b27e0cc51c675746530adbf4af07b24b9393b3e0ecb91d4133e2a179c2023fd0c8503d9faa992b5a398c92b2b9699f3f
+  data.tar.gz: 834167d66f21aac210b0ffe83093b1252245be3b1e11b15dd2879d409f353c6537a67b48107f56ba516873e2a0976d5f64a9e15e2bb8c8560ef71f019c70aaee

data/ext/etc/etc.c

@@ -52,7 +52,7 @@ char *getenv();
 #endif
 char *getlogin();
 
-#define RUBY_ETC_VERSION "1.2.0"
+#define RUBY_ETC_VERSION "1.3.0"
 
 #ifdef HAVE_RB_DEPRECATE_CONSTANT
 void rb_deprecate_constant(VALUE mod, const char *name);
@@ -62,22 +62,21 @@ void rb_deprecate_constant(VALUE mod, const char *name);
 
 #include "constdefs.h"
 
-#ifdef HAVE_RB_EXT_RACTOR_SAFE
-#include "ruby/thread_native.h"
+#ifdef HAVE_RUBY_ATOMIC_H
+# include "ruby/atomic.h"
 #else
-/* Implement rb_native_mutex_x using an int */
-typedef int rb_nativethread_lock_t;
-static int rb_native_mutex_trylock(int *mutex) {
-    if (*mutex) {
-    	return 1;
-    }
-    *mutex = 1;
-    return 0;
-}
-static void rb_native_mutex_unlock(int *mutex) {
-    *mutex = 0;
+typedef int rb_atomic_t;
+# define RUBY_ATOMIC_CAS(var, oldval, newval) \
+    ((var) == (oldval) ? ((var) = (newval), (oldval)) : (var))
+# define RUBY_ATOMIC_EXCHANGE(var, newval) \
+    atomic_exchange(&var, newval)
+static inline rb_atomic_t
+atomic_exchange(volatile rb_atomic_t *var, rb_atomic_t newval)
+{
+    rb_atomic_t oldval = *var;
+    *var = newval;
+    return oldval;
 }
-#define rb_native_mutex_initialize rb_native_mutex_unlock
 #endif
 
 /* call-seq:
@@ -258,12 +257,14 @@ etc_getpwnam(VALUE obj, VALUE nam)
 }
 
 #ifdef HAVE_GETPWENT
-static rb_nativethread_lock_t passwd_blocking;
+static rb_atomic_t passwd_blocking;
 static VALUE
 passwd_ensure(VALUE _)
 {
     endpwent();
-    rb_native_mutex_unlock(&passwd_blocking);
+    if (RUBY_ATOMIC_EXCHANGE(passwd_blocking, 0) != 1) {
+	rb_raise(rb_eRuntimeError, "unexpected passwd_blocking");
+    }
     return Qnil;
 }
 
@@ -282,7 +283,7 @@ passwd_iterate(VALUE _)
 static void
 each_passwd(void)
 {
-    if (rb_native_mutex_trylock(&passwd_blocking)) {
+    if (RUBY_ATOMIC_CAS(passwd_blocking, 0, 1)) {
 	rb_raise(rb_eRuntimeError, "parallel passwd iteration");
     }
     rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
@@ -500,12 +501,14 @@ etc_getgrnam(VALUE obj, VALUE nam)
 }
 
 #ifdef HAVE_GETGRENT
-static rb_nativethread_lock_t group_blocking;
+static rb_atomic_t group_blocking;
 static VALUE
 group_ensure(VALUE _)
 {
     endgrent();
-    rb_native_mutex_unlock(&group_blocking);
+    if (RUBY_ATOMIC_EXCHANGE(group_blocking, 0) != 1) {
+	rb_raise(rb_eRuntimeError, "unexpected group_blocking");
+    }
     return Qnil;
 }
 
@@ -525,7 +528,7 @@ group_iterate(VALUE _)
 static void
 each_group(void)
 {
-    if (rb_native_mutex_trylock(&group_blocking)) {
+    if (RUBY_ATOMIC_CAS(group_blocking, 0, 1)) {
 	rb_raise(rb_eRuntimeError, "parallel group iteration");
     }
     rb_ensure(group_iterate, 0, group_ensure, 0);
@@ -954,11 +957,13 @@ io_pathconf(VALUE io, VALUE arg)
 static int
 etc_nprocessors_affin(void)
 {
-    cpu_set_t *cpuset;
+    cpu_set_t *cpuset, cpuset_buff[1024 / sizeof(cpu_set_t)];
     size_t size;
     int ret;
     int n;
 
+    CPU_ZERO_S(sizeof(cpuset_buff), cpuset_buff);
+
     /*
      * XXX:
      * man page says CPU_ALLOC takes number of cpus. But it is not accurate
@@ -977,13 +982,12 @@ etc_nprocessors_affin(void)
      */
     for (n=64; n <= 16384; n *= 2) {
 	size = CPU_ALLOC_SIZE(n);
-	if (size >= 1024) {
+	if (size >= sizeof(cpuset_buff)) {
 	    cpuset = xcalloc(1, size);
 	    if (!cpuset)
 		return -1;
 	} else {
-	    cpuset = alloca(size);
-	    CPU_ZERO_S(size, cpuset);
+	    cpuset = cpuset_buff;
 	}
 
 	ret = sched_getaffinity(0, size, cpuset);
@@ -992,10 +996,10 @@ etc_nprocessors_affin(void)
 	    ret = CPU_COUNT_S(size, cpuset);
 	}
 
-	if (size >= 1024) {
+	if (size >= sizeof(cpuset_buff)) {
 	    xfree(cpuset);
 	}
-	if (ret > 0) {
+	if (ret > 0 || errno != EINVAL) {
 	    return ret;
 	}
     }
@@ -1199,11 +1203,7 @@ Init_etc(void)
     rb_deprecate_constant(rb_cStruct, "Passwd");
     rb_extend_object(sPasswd, rb_mEnumerable);
     rb_define_singleton_method(sPasswd, "each", etc_each_passwd, 0);
-#ifdef HAVE_GETPWENT
-    rb_native_mutex_initialize(&passwd_blocking);
-#endif
 #ifdef HAVE_GETGRENT
-    rb_native_mutex_initialize(&group_blocking);
     sGroup = rb_struct_define_under(mEtc, "Group", "name",
 #ifdef HAVE_STRUCT_GROUP_GR_PASSWD
 				    "passwd",

data/ext/etc/extconf.rb

@@ -47,10 +47,7 @@ if !File.exist?("#{srcdir}/depend")
   %x[#{RbConfig.ruby} #{srcdir}/mkconstants.rb -o #{srcdir}/constdefs.h]
 end
 
-decl = [
-  "void rb_deprecate_constant(VALUE, const char *);",
-]
-have_func('rb_deprecate_constant(Qnil, "None")', [decl])
+have_func('rb_deprecate_constant(Qnil, "None")')
 
 $distcleanfiles << "constdefs.h"
 

data/test/etc/test_etc.rb

@@ -171,6 +171,7 @@ class TestEtc < Test::Unit::TestCase
 
   def test_ractor
     return unless Etc.passwd # => skip test if no platform support
+    Etc.endpwent
 
     assert_ractor(<<~RUBY, require: 'etc')
       ractor = Ractor.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etc
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yukihiro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.2
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: Provides access to information typically stored in UNIX /etc directory.