summaryrefslogtreecommitdiff
path: root/include/atomic
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-01-12 17:03:45 +0100
committerSergei Golubchik <serg@mariadb.org>2015-01-13 10:15:21 +0100
commite695db0f2d97cbba2832e0f3dc25af5add1f16ac (patch)
tree7c03822a83a0b16ae513b22659b9ac43068b0411 /include/atomic
parent1f0ad6c6b3421a815ea6373c66aaf693852342cf (diff)
downloadmariadb-git-e695db0f2d97cbba2832e0f3dc25af5add1f16ac.tar.gz
MDEV-7437 remove suport for "atomics" with rwlocks
Diffstat (limited to 'include/atomic')
-rw-r--r--include/atomic/nolock.h15
-rw-r--r--include/atomic/rwlock.h63
2 files changed, 0 insertions, 78 deletions
diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h
index 56f37644f96..2137445a075 100644
--- a/include/atomic/nolock.h
+++ b/include/atomic/nolock.h
@@ -51,19 +51,4 @@
# endif
#endif
-#if defined(make_atomic_cas_body)
-/*
- Type not used so minimal size (emptry struct has different size between C
- and C++, zero-length array is gcc-specific).
-*/
-typedef char my_atomic_rwlock_t __attribute__ ((unused));
-#define my_atomic_rwlock_destroy(name)
-#define my_atomic_rwlock_init(name)
-#define my_atomic_rwlock_rdlock(name)
-#define my_atomic_rwlock_wrlock(name)
-#define my_atomic_rwlock_rdunlock(name)
-#define my_atomic_rwlock_wrunlock(name)
-
-#endif
-
#endif /* ATOMIC_NOLOCK_INCLUDED */
diff --git a/include/atomic/rwlock.h b/include/atomic/rwlock.h
deleted file mode 100644
index 2ffdd384cc5..00000000000
--- a/include/atomic/rwlock.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef ATOMIC_RWLOCK_INCLUDED
-#define ATOMIC_RWLOCK_INCLUDED
-
-/* Copyright (c) 2006 MySQL AB, 2009 Sun Microsystems, Inc.
- Use is subject to license terms.
-
- This program 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; version 2 of the License.
-
- This program 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.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#define MY_ATOMIC_MODE_RWLOCKS 1
-
-#ifdef MY_ATOMIC_MODE_DUMMY
-/*
- the following can never be enabled by ./configure, one need to put #define in
- a source to trigger the following warning. The resulting code will be broken,
- it only makes sense to do it to see now test_atomic detects broken
- implementations (another way is to run a UP build on an SMP box).
-*/
-#warning MY_ATOMIC_MODE_DUMMY and MY_ATOMIC_MODE_RWLOCKS are incompatible
-
-typedef char my_atomic_rwlock_t;
-
-#define my_atomic_rwlock_destroy(name)
-#define my_atomic_rwlock_init(name)
-#define my_atomic_rwlock_rdlock(name)
-#define my_atomic_rwlock_wrlock(name)
-#define my_atomic_rwlock_rdunlock(name)
-#define my_atomic_rwlock_wrunlock(name)
-#define MY_ATOMIC_MODE "dummy (non-atomic)"
-#else /* not MY_ATOMIC_MODE_DUMMY */
-
-typedef struct {pthread_mutex_t rw;} my_atomic_rwlock_t;
-
-#define my_atomic_rwlock_destroy(name) pthread_mutex_destroy(& (name)->rw)
-#define my_atomic_rwlock_init(name) pthread_mutex_init(& (name)->rw, 0)
-#define my_atomic_rwlock_rdlock(name) pthread_mutex_lock(& (name)->rw)
-#define my_atomic_rwlock_wrlock(name) pthread_mutex_lock(& (name)->rw)
-#define my_atomic_rwlock_rdunlock(name) pthread_mutex_unlock(& (name)->rw)
-#define my_atomic_rwlock_wrunlock(name) pthread_mutex_unlock(& (name)->rw)
-
-#define MY_ATOMIC_MODE "mutex"
-#ifndef MY_ATOMIC_MODE_RWLOCKS
-#define MY_ATOMIC_MODE_RWLOCKS 1
-#endif
-#endif
-
-#define make_atomic_add_body(S) int ## S sav; sav= *a; *a+= v; v=sav;
-#define make_atomic_fas_body(S) int ## S sav; sav= *a; *a= v; v=sav;
-#define make_atomic_cas_body(S) if ((ret= (*a == *cmp))) *a= set; else *cmp=*a;
-#define make_atomic_load_body(S) ret= *a;
-#define make_atomic_store_body(S) *a= v;
-
-#endif /* ATOMIC_RWLOCK_INCLUDED */