Rewrote CAtomicFixnum based on CAtomic.

Author: jdantonio

ext/concurrent_ruby_ext/atomic_boolean.c

@@ -1,5 +1,4 @@
 #include <ruby.h>
-#include <stdbool.h>
 
 #include "atomic_boolean.h"
 #include "atomic_reference.h"

ext/concurrent_ruby_ext/atomic_fixnum.c

@@ -1,129 +1,49 @@
 #include <ruby.h>
-#include <stdbool.h>
 
 #include "atomic_fixnum.h"
+#include "atomic_reference.h"
 
-// http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/_005f_005fatomic-Builtins.html
-
-VALUE atomic_fixnum_allocate(VALUE klass) {
-  CAtomicFixnum* atomic;
-  VALUE sval = Data_Make_Struct(klass, CAtomicFixnum, NULL, atomic_fixnum_deallocate, atomic);
-
-#ifndef __USE_GCC_ATOMIC
-  pthread_mutex_init(&atomic->mutex, NULL);
-#endif
-
-  return(sval);
+void atomic_fixnum_mark(void *value) {
+  rb_gc_mark_maybe((VALUE) value);
 }
 
-void atomic_fixnum_deallocate(void* sval) {
-  CAtomicFixnum* atomic = (CAtomicFixnum*) sval;
-
-#ifndef __USE_GCC_ATOMIC
-  pthread_mutex_destroy(&atomic->mutex);
-#endif
-
-  free(atomic);
+VALUE atomic_fixnum_allocate(VALUE klass) {
+  return rb_data_object_alloc(klass, (void *) Qnil, atomic_fixnum_mark, NULL);
 }
 
 VALUE method_atomic_fixnum_initialize(int argc, VALUE* argv, VALUE self) {
-  CAtomicFixnum* atomic;
-
+  VALUE value = INT2NUM(0);
   rb_check_arity(argc, 0, 1);
-  if (argc == 1) Check_Type(argv[0], T_FIXNUM);
-
-  Data_Get_Struct(self, CAtomicFixnum, atomic);
-
-  atomic->value = (argc == 1 ? FIX2INT(argv[0]) : 0);
+  if (argc == 1) {
+    Check_Type(argv[0], T_FIXNUM);
+    value = argv[0];
+  }
+  DATA_PTR(self) = (void *) value;
   return(self);
 }
 
 VALUE method_atomic_fixnum_value(VALUE self) {
-  CAtomicFixnum* atomic;
-  long value;
-
-  Data_Get_Struct(self, CAtomicFixnum, atomic);
-
-#ifdef __USE_GCC_ATOMIC
-  value = __atomic_load_n(&atomic->value, __ATOMIC_SEQ_CST);
-#else
-  pthread_mutex_lock(&atomic->mutex);
-  value = atomic->value;
-  pthread_mutex_unlock(&atomic->mutex);
-#endif
-
-  return INT2FIX(value);
+  return (VALUE) DATA_PTR(self);
 }
 
 VALUE method_atomic_fixnum_value_set(VALUE self, VALUE value) {
-  CAtomicFixnum* atomic;
-  long new_value;
-
   Check_Type(value, T_FIXNUM);
-
-  new_value = FIX2INT(value);
-  Data_Get_Struct(self, CAtomicFixnum, atomic);
-
-#ifdef __USE_GCC_ATOMIC
-  __atomic_store_n(&atomic->value, new_value, __ATOMIC_SEQ_CST);
-#else
-  pthread_mutex_lock(&atomic->mutex);
-  atomic->value = new_value;
-  pthread_mutex_unlock(&atomic->mutex);
-#endif
-
+  DATA_PTR(self) = (void *) value;
   return(value);
 }
 
 VALUE method_atomic_fixnum_increment(VALUE self) {
-  CAtomicFixnum* atomic;
-  long value;
-
-  Data_Get_Struct(self, CAtomicFixnum, atomic);
-  value = ++atomic->value;
-
-  return(INT2FIX(value));
+  long value = NUM2INT((VALUE) DATA_PTR(self));
+  return method_atomic_fixnum_value_set(self, INT2NUM(value + 1));
 }
 
 VALUE method_atomic_fixnum_decrement(VALUE self) {
-  CAtomicFixnum* atomic;
-  long value;
-
-  Data_Get_Struct(self, CAtomicFixnum, atomic);
-  value = --atomic->value;
-
-  return(INT2FIX(value));
+  long value = NUM2INT((VALUE) DATA_PTR(self));
+  return method_atomic_fixnum_value_set(self, INT2NUM(value - 1));
 }
 
 VALUE method_atomic_fixnum_compare_and_set(VALUE self, VALUE rb_expect, VALUE rb_update) {
-  CAtomicFixnum* atomic;
-  long expect, update;
-
-#ifdef __USE_GCC_ATOMIC
-  VALUE value;
-#else
-  VALUE value = Qfalse;
-#endif
-
   Check_Type(rb_expect, T_FIXNUM);
   Check_Type(rb_update, T_FIXNUM);
-
-  Data_Get_Struct(self, CAtomicFixnum, atomic);
-
-  expect = FIX2INT(rb_expect);
-  update = FIX2INT(rb_update);
-
-#ifdef __USE_GCC_ATOMIC
-  value = __atomic_compare_exchange_n(&atomic->value, &expect, update, false,
-      __ATOMIC_RELEASE, __ATOMIC_SEQ_CST) ? Qtrue : Qfalse;
-#else
-  pthread_mutex_lock(&atomic->mutex);
-  if (atomic->value == expect) {
-    atomic->value = update;
-    value = Qtrue;
-  }
-  pthread_mutex_unlock(&atomic->mutex);
-#endif
-
-  return(value);
+  return ir_compare_and_set(self, rb_expect, rb_update);
 }

ext/concurrent_ruby_ext/atomic_fixnum.h

@@ -1,23 +1,8 @@
 #ifndef __ATOMIC_FIXNUM_H__
 #define __ATOMIC_FIXNUM_H__
 
-#ifdef __ATOMIC_SEQ_CST
-#define __USE_GCC_ATOMIC
-#endif
-
-#ifndef __USE_GCC_ATOMIC
-#include <pthread.h>
-#endif
-
-typedef struct atomic_fixnum {
-  long value;
-#ifndef __USE_GCC_ATOMIC
-  pthread_mutex_t mutex;
-#endif
-} CAtomicFixnum;
-
+void atomic_fixnum_mark(void*);
 VALUE atomic_fixnum_allocate(VALUE);
-void atomic_fixnum_deallocate(void*);
 VALUE method_atomic_fixnum_initialize(int, VALUE*, VALUE);
 VALUE method_atomic_fixnum_value(VALUE);
 VALUE method_atomic_fixnum_value_set(VALUE, VALUE);

spec/concurrent/atomic/atomic_fixnum_spec.rb

@@ -165,7 +165,14 @@ module Concurrent
     end
   end
 
-  if TestHelpers.jruby?
+  if defined? Concurrent::CAtomicFixnum
+
+    describe CAtomicFixnum do
+      it_should_behave_like :atomic_fixnum
+    end
+  end
+
+  if RUBY_PLATFORM == 'java'
 
     describe JavaAtomicFixnum do
       it_should_behave_like :atomic_fixnum