From 72e7f011b29998d8a3e15eb5b381ef962af5fe5b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 5 Apr 2019 10:30:58 +0300 Subject: Upgrade to 8.0.15 --- mysql/atomic/gcc_atomic.h | 94 ------------------------------ mysql/atomic/gcc_sync.h | 106 ---------------------------------- mysql/atomic/generic-msvc.h | 135 -------------------------------------------- mysql/atomic/solaris.h | 117 -------------------------------------- 4 files changed, 452 deletions(-) delete mode 100644 mysql/atomic/gcc_atomic.h delete mode 100644 mysql/atomic/gcc_sync.h delete mode 100644 mysql/atomic/generic-msvc.h delete mode 100644 mysql/atomic/solaris.h (limited to 'mysql/atomic') diff --git a/mysql/atomic/gcc_atomic.h b/mysql/atomic/gcc_atomic.h deleted file mode 100644 index 8807857..0000000 --- a/mysql/atomic/gcc_atomic.h +++ /dev/null @@ -1,94 +0,0 @@ -#ifndef GCC_ATOMIC_INCLUDED -#define GCC_ATOMIC_INCLUDED - -/* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. - - 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 */ - -/* New GCC __atomic builtins introduced in GCC 4.7 */ - -static inline int my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set) -{ - return __atomic_compare_exchange_n(a, cmp, set, 0, - __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); -} - -static inline int my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set) -{ - return __atomic_compare_exchange_n(a, cmp, set, 0, - __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); -} - -static inline int my_atomic_casptr(void * volatile *a, void **cmp, void *set) -{ - return __atomic_compare_exchange_n(a, cmp, set, 0, - __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); -} - -static inline int32 my_atomic_add32(int32 volatile *a, int32 v) -{ - return __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST); -} - -static inline int64 my_atomic_add64(int64 volatile *a, int64 v) -{ - return __atomic_fetch_add(a, v, __ATOMIC_SEQ_CST); -} - -static inline int32 my_atomic_fas32(int32 volatile *a, int32 v) -{ - return __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST); -} - -static inline int64 my_atomic_fas64(int64 volatile *a, int64 v) -{ - return __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST); -} - -static inline void * my_atomic_fasptr(void * volatile *a, void * v) -{ - return __atomic_exchange_n(a, v, __ATOMIC_SEQ_CST); -} - -static inline int32 my_atomic_load32(int32 volatile *a) -{ - return __atomic_load_n(a, __ATOMIC_SEQ_CST); -} - -static inline int64 my_atomic_load64(int64 volatile *a) -{ - return __atomic_load_n(a, __ATOMIC_SEQ_CST); -} - -static inline void* my_atomic_loadptr(void * volatile *a) -{ - return __atomic_load_n(a, __ATOMIC_SEQ_CST); -} - -static inline void my_atomic_store32(int32 volatile *a, int32 v) -{ - __atomic_store_n(a, v, __ATOMIC_SEQ_CST); -} - -static inline void my_atomic_store64(int64 volatile *a, int64 v) -{ - __atomic_store_n(a, v, __ATOMIC_SEQ_CST); -} - -static inline void my_atomic_storeptr(void * volatile *a, void *v) -{ - __atomic_store_n(a, v, __ATOMIC_SEQ_CST); -} - -#endif /* GCC_ATOMIC_INCLUDED */ diff --git a/mysql/atomic/gcc_sync.h b/mysql/atomic/gcc_sync.h deleted file mode 100644 index 82eea35..0000000 --- a/mysql/atomic/gcc_sync.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef GCC_SYNC_INCLUDED -#define GCC_SYNC_INCLUDED - -/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. - - 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 */ - -/* Old GCC __sync builtins introduced in GCC 4.1 */ - -static inline int my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set) -{ - int32 cmp_val= *cmp; - int32 sav= __sync_val_compare_and_swap(a, cmp_val, set); - int ret= (sav == cmp_val); - if (!ret) - *cmp = sav; - return ret; -} - -static inline int my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set) -{ - int64 cmp_val= *cmp; - int64 sav= __sync_val_compare_and_swap(a, cmp_val, set); - int ret= (sav == cmp_val); - if (!ret) - *cmp = sav; - return ret; -} - -static inline int my_atomic_casptr(void * volatile *a, void **cmp, void *set) -{ - void *cmp_val= *cmp; - void *sav= __sync_val_compare_and_swap(a, cmp_val, set); - int ret= (sav == cmp_val); - if (!ret) - *cmp = sav; - return ret; -} - -static inline int32 my_atomic_add32(int32 volatile *a, int32 v) -{ - return __sync_fetch_and_add(a, v); -} - -static inline int64 my_atomic_add64(int64 volatile *a, int64 v) -{ - return __sync_fetch_and_add(a, v); -} - -static inline int32 my_atomic_fas32(int32 volatile *a, int32 v) -{ - return __sync_lock_test_and_set(a, v); -} - -static inline int64 my_atomic_fas64(int64 volatile *a, int64 v) -{ - return __sync_lock_test_and_set(a, v); -} - -static inline void * my_atomic_fasptr(void * volatile *a, void * v) -{ - return __sync_lock_test_and_set(a, v); -} - -static inline int32 my_atomic_load32(int32 volatile *a) -{ - return __sync_fetch_and_or(a, 0); -} - -static inline int64 my_atomic_load64(int64 volatile *a) -{ - return __sync_fetch_and_or(a, 0); -} - -static inline void* my_atomic_loadptr(void * volatile *a) -{ - return __sync_fetch_and_or(a, 0); -} - -static inline void my_atomic_store32(int32 volatile *a, int32 v) -{ - (void) __sync_lock_test_and_set(a, v); -} - -static inline void my_atomic_store64(int64 volatile *a, int64 v) -{ - (void) __sync_lock_test_and_set(a, v); -} - -static inline void my_atomic_storeptr(void * volatile *a, void *v) -{ - (void) __sync_lock_test_and_set(a, v); -} - -#endif /* GCC_SYNC_INCLUDED */ diff --git a/mysql/atomic/generic-msvc.h b/mysql/atomic/generic-msvc.h deleted file mode 100644 index 9fe2cdd..0000000 --- a/mysql/atomic/generic-msvc.h +++ /dev/null @@ -1,135 +0,0 @@ -#ifndef ATOMIC_MSC_INCLUDED -#define ATOMIC_MSC_INCLUDED - -/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. - - 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 */ - -#include - -static inline int my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set) -{ - int32 initial_cmp= *cmp; - int32 initial_a= InterlockedCompareExchange((volatile LONG*)a, - set, initial_cmp); - int ret= (initial_a == initial_cmp); - if (!ret) - *cmp= initial_a; - return ret; -} - -static inline int my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set) -{ - int64 initial_cmp= *cmp; - int64 initial_a= InterlockedCompareExchange64((volatile LONGLONG*)a, - (LONGLONG)set, - (LONGLONG)initial_cmp); - int ret= (initial_a == initial_cmp); - if (!ret) - *cmp= initial_a; - return ret; -} - -static inline int my_atomic_casptr(void * volatile *a, void **cmp, void *set) -{ - void *initial_cmp= *cmp; - void *initial_a= InterlockedCompareExchangePointer(a, set, initial_cmp); - int ret= (initial_a == initial_cmp); - if (!ret) - *cmp= initial_a; - return ret; -} - -static inline int32 my_atomic_add32(int32 volatile *a, int32 v) -{ - return (int32)InterlockedExchangeAdd((volatile LONG*)a, v); -} - -static inline int64 my_atomic_add64(int64 volatile *a, int64 v) -{ - return (int64)InterlockedExchangeAdd64((volatile LONGLONG*)a, (LONGLONG)v); -} - -static inline int32 my_atomic_load32(int32 volatile *a) -{ - return (int32)InterlockedCompareExchange((volatile LONG *)a, 0, 0); -} - -static inline int64 my_atomic_load64(int64 volatile *a) -{ - return (int64)InterlockedCompareExchange64((volatile LONGLONG *)a, 0, 0); -} - -static inline void* my_atomic_loadptr(void * volatile *a) -{ - return InterlockedCompareExchangePointer(a, 0, 0); -} - -static inline int32 my_atomic_fas32(int32 volatile *a, int32 v) -{ - return (int32)InterlockedExchange((volatile LONG*)a, v); -} - -static inline int64 my_atomic_fas64(int64 volatile *a, int64 v) -{ - return (int64)InterlockedExchange64((volatile LONGLONG*)a, v); -} - -static inline void * my_atomic_fasptr(void * volatile *a, void * v) -{ - return InterlockedExchangePointer(a, v); -} - -static inline void my_atomic_store32(int32 volatile *a, int32 v) -{ - (void)InterlockedExchange((volatile LONG*)a, v); -} - -static inline void my_atomic_store64(int64 volatile *a, int64 v) -{ - (void)InterlockedExchange64((volatile LONGLONG*)a, v); -} - -static inline void my_atomic_storeptr(void * volatile *a, void *v) -{ - (void)InterlockedExchangePointer(a, v); -} - - -/* - my_yield_processor (equivalent of x86 PAUSE instruction) should be used - to improve performance on hyperthreaded CPUs. Intel recommends to use it in - spin loops also on non-HT machines to reduce power consumption (see e.g - http://softwarecommunity.intel.com/articles/eng/2004.htm) - - Running benchmarks for spinlocks implemented with InterlockedCompareExchange - and YieldProcessor shows that much better performance is achieved by calling - YieldProcessor in a loop - that is, yielding longer. On Intel boxes setting - loop count in the range 200-300 brought best results. - */ -#define YIELD_LOOPS 200 - -static inline int my_yield_processor() -{ - int i; - for (i=0; i - -#if defined(__GNUC__) -#define atomic_typeof(T,V) __typeof__(V) -#else -#define atomic_typeof(T,V) T -#endif - -static inline int my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set) -{ - int ret; - atomic_typeof(uint32_t, *cmp) sav; - sav= atomic_cas_32((volatile uint32_t *)a, (uint32_t)*cmp, (uint32_t)set); - ret= (sav == *cmp); - if (!ret) - *cmp= sav; - return ret; -} - -static inline int my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set) -{ - int ret; - atomic_typeof(uint64_t, *cmp) sav; - sav= atomic_cas_64((volatile uint64_t *)a, (uint64_t)*cmp, (uint64_t)set); - ret= (sav == *cmp); - if (!ret) - *cmp= sav; - return ret; -} - -static inline int my_atomic_casptr(void * volatile *a, void **cmp, void *set) -{ - int ret; - atomic_typeof(void *, *cmp) sav; - sav= atomic_cas_ptr((volatile void **)a, (void *)*cmp, (void *)set); - ret= (sav == *cmp); - if (!ret) - *cmp= sav; - return ret; -} - -static inline int32 my_atomic_add32(int32 volatile *a, int32 v) -{ - int32 nv= atomic_add_32_nv((volatile uint32_t *)a, v); - return nv - v; -} - -static inline int64 my_atomic_add64(int64 volatile *a, int64 v) -{ - int64 nv= atomic_add_64_nv((volatile uint64_t *)a, v); - return nv - v; -} - -static inline int32 my_atomic_fas32(int32 volatile *a, int32 v) -{ - return atomic_swap_32((volatile uint32_t *)a, (uint32_t)v); -} - -static inline int64 my_atomic_fas64(int64 volatile *a, int64 v) -{ - return atomic_swap_64((volatile uint64_t *)a, (uint64_t)v); -} - -static inline void * my_atomic_fasptr(void * volatile *a, void * v) -{ - return atomic_swap_ptr(a, v); -} - -static inline int32 my_atomic_load32(int32 volatile *a) -{ - return atomic_or_32_nv((volatile uint32_t *)a, 0); -} - -static inline int64 my_atomic_load64(int64 volatile *a) -{ - return atomic_or_64_nv((volatile uint64_t *)a, 0); -} - -static inline void* my_atomic_loadptr(void * volatile *a) -{ - return atomic_add_ptr_nv(a, 0); -} - -static inline void my_atomic_store32(int32 volatile *a, int32 v) -{ - (void) atomic_swap_32((volatile uint32_t *)a, (uint32_t)v); -} - -static inline void my_atomic_store64(int64 volatile *a, int64 v) -{ - (void) atomic_swap_64((volatile uint64_t *)a, (uint64_t)v); -} - -static inline void my_atomic_storeptr(void * volatile *a, void *v) -{ - (void) atomic_swap_ptr((volatile void **)a, (void *)v); -} - -#endif /* ATOMIC_SOLARIS_INCLUDED */ -- cgit v1.1