Implement atomic operations on Solaris 10 using atomic.h provided functions.

Author: wilx

configure

@@ -8765,6 +8765,14 @@ if test "x$ac_cv_header_limits_h" = xyes; then :
 fi
 
 
+
+   ac_fn_cxx_check_header_mongrel "$LINENO" "atomic.h" "ac_cv_header_atomic_h" "$ac_includes_default"
+if test "x$ac_cv_header_atomic_h" = xyes; then :
+  $as_echo "#define LOG4CPLUS_HAVE_ATOMIC_H 1" >>confdefs.h
+
+fi
+
+
 if test "x$with_iconv" = "xyes"; then :
 
    ac_fn_cxx_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
@@ -9631,6 +9639,96 @@ fi
 
 
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic_inc_uint" >&5
+$as_echo_n "checking for atomic_inc_uint... " >&6; }
+if ${ac_cv_atomic_inc_uint+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+#include <atomic.h>
+
+int
+main ()
+{
+
+volatile unsigned int x = 1;
+atomic_inc_uint (&x);
+if (x != 2)
+  abort ();
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_atomic_inc_uint=yes
+else
+  ac_cv_atomic_inc_uint=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_atomic_inc_uint" >&5
+$as_echo "$ac_cv_atomic_inc_uint" >&6; }
+
+if test "x$ac_cv_atomic_inc_uint" = "xyes"; then :
+  $as_echo "#define HAVE_ATOMIC_INC_UINT 1" >>confdefs.h
+
+fi
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic_dec_uint_nv" >&5
+$as_echo_n "checking for atomic_dec_uint_nv... " >&6; }
+if ${ac_cv_atomic_dec_uint_nv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <stdlib.h>
+
+int
+main ()
+{
+
+volatile unsigned int x = 2;
+volatile unsigned int y = atomic_dec_uint_nv (&x);
+membar_exit();
+if (x != 1 || y != 1)
+  abort ();
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_atomic_dec_uint_nv=yes
+else
+  ac_cv_atomic_dec_uint_nv=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_atomic_dec_uint_nv" >&5
+$as_echo "$ac_cv_atomic_dec_uint_nv" >&6; }
+
+if test "x$ac_cv_atomic_dec_uint_nv" = "xyes"; then :
+  $as_echo "#define HAVE_ATOMIC_DEC_UINT_NV 1" >>confdefs.h
+
+fi
+
+
+
    if test "x$ac_cv___sync_add_and_fetch" = "xyes"; then :
   $as_echo "#define LOG4CPLUS_HAVE___SYNC_ADD_AND_FETCH 1" >>confdefs.h
 
@@ -9661,6 +9759,18 @@ fi
 fi
 
 
+   if test "x$ax_cv_atomic_inc_uint"; then :
+  $as_echo "#define LOG4CPLUS_HAVE_ATOMIC_INC_UINT 1" >>confdefs.h
+
+fi
+
+
+   if test "x$ax_cv_atomic_dec_uint_nv"; then :
+  $as_echo "#define LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV 1" >>confdefs.h
+
+fi
+
+
 
 
 

configure.ac

@@ -340,6 +340,7 @@ LOG4CPLUS_CHECK_HEADER([wchar.h], [LOG4CPLUS_HAVE_WCHAR_H])
 LOG4CPLUS_CHECK_HEADER([time.h], [LOG4CPLUS_HAVE_TIME_H])
 LOG4CPLUS_CHECK_HEADER([errno.h], [LOG4CPLUS_HAVE_ERRNO_H])
 LOG4CPLUS_CHECK_HEADER([limits.h], [LOG4CPLUS_HAVE_LIMITS_H])
+LOG4CPLUS_CHECK_HEADER([atomic.h], [LOG4CPLUS_HAVE_ATOMIC_H])
 AS_IF([test "x$with_iconv" = "xyes"],
   [LOG4CPLUS_CHECK_HEADER([iconv.h], [LOG4CPLUS_HAVE_ICONV_H])])
 
@@ -406,6 +407,14 @@ dnl Multi threaded library.
    AS_IF([test "x$ac_cv___atomic_sub_fetch" = "xyes"],
      [AC_DEFINE([LOG4CPLUS_HAVE___ATOMIC_SUB_FETCH])])
 
+   AH_TEMPLATE([LOG4CPLUS_HAVE_ATOMIC_INC_UINT])
+   AS_IF([test "x$ax_cv_atomic_inc_uint"],
+     [AC_DEFINE([LOG4CPLUS_HAVE_ATOMIC_INC_UINT])])
+
+   AH_TEMPLATE([LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV])
+   AS_IF([test "x$ax_cv_atomic_dec_uint_nv"],
+     [AC_DEFINE([LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV])])
+
    AX_TLS_SUPPORT
    AH_TEMPLATE([LOG4CPLUS_HAVE_TLS_SUPPORT])
    AH_TEMPLATE([LOG4CPLUS_THREAD_LOCAL_VAR])

include/log4cplus/config.h.in

@@ -11,6 +11,12 @@
 /* Defined if the compiler supports GNU style variadic macros. */
 #undef HAS_GNU_VARIADIC_MACROS
 
+/* Defined if the compiler provides atomic_dec_uint_nv(). */
+#undef HAVE_ATOMIC_DEC_UINT_NV
+
+/* Defined if the compiler provides atomic_inc_uint(). */
+#undef HAVE_ATOMIC_INC_UINT
+
 /* Define to 1 if you have the `clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME
 
@@ -217,6 +223,15 @@
 /* */
 #undef LOG4CPLUS_HAVE_ARPA_INET_H
 
+/* */
+#undef LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV
+
+/* */
+#undef LOG4CPLUS_HAVE_ATOMIC_H
+
+/* */
+#undef LOG4CPLUS_HAVE_ATOMIC_INC_UINT
+
 /* */
 #undef LOG4CPLUS_HAVE_C99_VARIADIC_MACROS
 

include/log4cplus/config/defines.hxx.in

@@ -177,6 +177,12 @@
 /* Defined if the compiler provides __atomic_sub_fetch(). */
 #undef LOG4CPLUS_HAVE___ATOMIC_SUB_FETCH
 
+/* Defined if atomic_inc_uint() is available. */
+#undef LOG4CPLUS_HAVE_ATOMIC_INC_UINT
+
+/* Defined if atomic_dec_uint_nv() is available.  */
+#undef LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV
+
 /* Defined if the compiler provides C++11 <atomic> header and increment,
    decrement operations. */
 #undef LOG4CPLUS_HAVE_CXX11_ATOMICS

m4/ax__sync.m4

@@ -147,4 +147,60 @@ if (x != 1 || y != 1)
 AS_IF([test "x$ac_cv___atomic_sub_fetch" = "xyes"],
   [AC_DEFINE([HAVE___ATOMIC_SUB_FETCH], [1])])
 
+dnl
+dnl Check for Solaris 10 atomic.h provided functions.
+dnl
+
+AH_TEMPLATE([HAVE_ATOMIC_INC_UINT],
+  [Defined if the compiler provides atomic_inc_uint().])
+
+AC_CACHE_CHECK([for atomic_inc_uint], [ac_cv_atomic_inc_uint],
+[
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+      [[
+#include <stdlib.h>
+#include <atomic.h>
+      ]], 
+      [[
+volatile unsigned int x = 1;
+atomic_inc_uint (&x);
+if (x != 2)
+  abort ();
+      ]])],
+    [ac_cv_atomic_inc_uint=yes],
+    [ac_cv_atomic_inc_uint=no])
+])
+
+AS_IF([test "x$ac_cv_atomic_inc_uint" = "xyes"],
+  [AC_DEFINE([HAVE_ATOMIC_INC_UINT], [1])])
+
+dnl
+dnl Check for atomic_dec_uint_nv().
+dnl
+
+AH_TEMPLATE([HAVE_ATOMIC_DEC_UINT_NV], 
+  [Defined if the compiler provides atomic_dec_uint_nv().])
+
+AC_CACHE_CHECK([for atomic_dec_uint_nv], [ac_cv_atomic_dec_uint_nv],
+[
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+      [[
+#include <stdlib.h>
+      ]], 
+      [[
+volatile unsigned int x = 2;
+volatile unsigned int y = atomic_dec_uint_nv (&x);
+membar_exit();
+if (x != 1 || y != 1)
+  abort ();
+      ]])],
+    [ac_cv_atomic_dec_uint_nv=yes],
+    [ac_cv_atomic_dec_uint_nv=no])
+])
+
+AS_IF([test "x$ac_cv_atomic_dec_uint_nv" = "xyes"],
+  [AC_DEFINE([HAVE_ATOMIC_DEC_UINT_NV], [1])])
+
 ])

src/pointer.cxx

@@ -27,6 +27,9 @@
 #if defined (LOG4CPLUS_HAVE_INTRIN_H)
 #include <intrin.h>
 #endif
+#if defined (LOG4CPLUS_HAVE_ATOMIC_H)
+#include <atomic.h>
+#endif
 
 
 namespace log4cplus { namespace helpers {
@@ -63,6 +66,9 @@ SharedObject::addReference() const
 #elif defined (LOG4CPLUS_HAVE___SYNC_ADD_AND_FETCH)
     __sync_add_and_fetch (&count, 1);
 
+#elif defined (LOG4CPLUS_HAVE_ATOMIC_INC_UINT)
+    atomic_inc_uint (&count);
+
 #elif defined (_WIN32) && defined (LOG4CPLUS_HAVE_INTRIN_H)
     _InterlockedIncrement (&count);
 
@@ -101,6 +107,11 @@ SharedObject::removeReference() const
 #elif defined (LOG4CPLUS_HAVE___SYNC_SUB_AND_FETCH)
     destroy = __sync_sub_and_fetch (&count, 1) == 0;
 
+#elif defined (LOG4CPLUS_HAVE_ATOMIC_DEC_UINT_NV)
+    destroy = atomic_dec_uint_nv (&count) == 0;
+    if (destroy)
+        membar_exit ();
+
 #elif defined (_WIN32) && defined (LOG4CPLUS_HAVE_INTRIN_H)
     destroy = _InterlockedDecrement (&count) == 0;