[0.97.2] generic atomicity.h

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@687 0c269be4-1314-0410-8aa9-9f06e86f4224

2 files changed, 26 insertions, 63 deletions

diff --git a/config/cpu/generic/atomicity.h b/config/cpu/generic/atomicity.h
index ab7fad8..655cc14 100644
--- a/config/cpu/generic/atomicity.h
+++ b/config/cpu/generic/atomicity.h
@@ -1,80 +1,43 @@
-// Low-level functions for atomic operations: Generic version  -*- C++ -*-
+/* Low-level functions for atomic operations.  Stub version.
+   Copyright (C) 1997,2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-// Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
+#ifndef _ATOMICITY_H
+#define _ATOMICITY_H	1
 
-#ifndef _GLIBCXX_ATOMICITY_H
-#define _GLIBCXX_ATOMICITY_H	1
-
-#warning No native atomic operations are provided for this platform.
-#warning They will be faked using a mutex, degrading performance.
-
-#include <bits/gthr.h>
-
-#define _GLIBCXX_NEED_GENERIC_MUTEX
+#warning "stub atomicity functions are not atomic on this platform"
 
 typedef int _Atomic_word;
 
-namespace __gnu_cxx
-{
-  extern __gthread_mutex_t _Atomic_add_mutex;
-
-#ifndef __GTHREAD_MUTEX_INIT
-  extern __gthread_once_t _Atomic_add_mutex_once;
-  extern void __gthread_atomic_add_mutex_once();
-#endif
-}
-
-static inline _Atomic_word
+static inline _Atomic_word 
 __attribute__ ((__unused__))
-__exchange_and_add(volatile _Atomic_word* __mem, int __val)
+__exchange_and_add(volatile _Atomic_word* mem, int val)
 {
-#ifndef __GTHREAD_MUTEX_INIT
-  __gthread_once(&__gnu_cxx::_Atomic_add_mutex_once,
-		 __gnu_cxx::__gthread_atomic_add_mutex_once);
-#endif
-
-  _Atomic_word __result;
-
-  __gthread_mutex_lock(&__gnu_cxx::_Atomic_add_mutex);
-
-  __result = *__mem;
-  *__mem += __val;
-
-  __gthread_mutex_unlock(&__gnu_cxx::_Atomic_add_mutex);
-  return __result;
+  int result = *mem;
+  *mem += val;
+  return result;
 }
 
-
 static inline void
 __attribute__ ((__unused__))
-__atomic_add(volatile _Atomic_word* __mem, int __val)
+__atomic_add(volatile _Atomic_word* mem, int val)
 {
-  (void) __exchange_and_add(__mem, __val);
+  *mem += val;
 }
 
 #endif /* atomicity.h */
diff --git a/configure.in b/configure.in
index eda4a3c..892d56b 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ dnl                 changes are made
 dnl ---
 JACK_MAJOR_VERSION=0
 JACK_MINOR_VERSION=97
-JACK_MICRO_VERSION=1
+JACK_MICRO_VERSION=2
 
 dnl ---
 dnl HOWTO: updating the jack protocol version