Commit 2c0f77a9 authored by Mikael Ronstrom's avatar Mikael Ronstrom

Added extra checks of 64-bit atomic support on GCC and Solaris, also added...

Added extra checks of 64-bit atomic support on GCC and Solaris, also added 64-bit support in solaris.h which was missing
parent 495ab702
...@@ -1889,6 +1889,7 @@ AC_CACHE_CHECK([whether the compiler provides atomic builtins], ...@@ -1889,6 +1889,7 @@ AC_CACHE_CHECK([whether the compiler provides atomic builtins],
], ],
[[ [[
int foo= -10; int bar= 10; int foo= -10; int bar= 10;
long long int foo64= -10; long long int bar64= 10;
if (!__sync_fetch_and_add(&foo, bar) || foo) if (!__sync_fetch_and_add(&foo, bar) || foo)
return -1; return -1;
bar= __sync_lock_test_and_set(&foo, bar); bar= __sync_lock_test_and_set(&foo, bar);
...@@ -1897,6 +1898,14 @@ AC_CACHE_CHECK([whether the compiler provides atomic builtins], ...@@ -1897,6 +1898,14 @@ AC_CACHE_CHECK([whether the compiler provides atomic builtins],
bar= __sync_val_compare_and_swap(&bar, foo, 15); bar= __sync_val_compare_and_swap(&bar, foo, 15);
if (bar) if (bar)
return -1; return -1;
if (!__sync_fetch_and_add(&foo64, bar64) || foo64)
return -1;
bar64= __sync_lock_test_and_set(&foo64, bar64);
if (bar64 || foo64 != 10)
return -1;
bar64= __sync_val_compare_and_swap(&bar64, foo, 15);
if (bar64)
return -1;
return 0; return 0;
]] ]]
)], )],
...@@ -1918,6 +1927,7 @@ AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris], ...@@ -1918,6 +1927,7 @@ AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris],
] ]
[[ [[
int foo = -10; int bar = 10; int foo = -10; int bar = 10;
int64_t foo64 = -10; int64_t bar64 = 10;
if (atomic_add_int_nv((uint_t *)&foo, bar) || foo) if (atomic_add_int_nv((uint_t *)&foo, bar) || foo)
return -1; return -1;
bar = atomic_swap_uint((uint_t *)&foo, (uint_t)bar); bar = atomic_swap_uint((uint_t *)&foo, (uint_t)bar);
...@@ -1926,6 +1936,17 @@ AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris], ...@@ -1926,6 +1936,17 @@ AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris],
bar = atomic_cas_uint((uint_t *)&bar, (uint_t)foo, 15); bar = atomic_cas_uint((uint_t *)&bar, (uint_t)foo, 15);
if (bar) if (bar)
return -1; return -1;
if (atomic_add_64_nv((volatile uint64_t *)&foo64, bar64) || foo64)
return -1;
bar64 = atomic_swap_64((volatile uint64_t *)&foo64, (uint64_t)bar64);
if (bar64 || foo64 != 10)
return -1;
bar64 = atomic_cas_64((volatile uint64_t *)&bar64, (uint_t)foo64, 15);
if (bar64)
return -1;
foo64 = atomic_or_64((volatile uint64_t *)&bar64, 0);
if (foo64)
return -1;
return 0; return 0;
]] ]]
)], )],
......
/* Copyright (C) 2008 MySQL AB /* Copyright (C) 2008 MySQL AB, 2009 Sun Microsystems, Inc
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -60,6 +60,18 @@ my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set) ...@@ -60,6 +60,18 @@ my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set)
return ret; return ret;
} }
STATIC_INLINE int
my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set)
{
int ret;
int64 sav;
sav = (int64) atomic_cas_64((volatile uint64_t *)a, (uint64_t)*cmp,
(uint64_t)set);
if (! (ret = (sav == *cmp)))
*cmp = sav;
return ret;
}
STATIC_INLINE int STATIC_INLINE int
my_atomic_casptr(void * volatile *a, void **cmp, void *set) my_atomic_casptr(void * volatile *a, void **cmp, void *set)
{ {
...@@ -97,6 +109,14 @@ my_atomic_add32(int32 volatile *a, int32 v) ...@@ -97,6 +109,14 @@ my_atomic_add32(int32 volatile *a, int32 v)
return (nv - v); return (nv - v);
} }
STATIC_INLINE int64
my_atomic_add64(int64 volatile *a, int64 v)
{
int64 nv;
nv = atomic_add_64_nv((volatile uint64_t *)a, v);
return (nv - v);
}
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
#ifdef MY_ATOMIC_MODE_DUMMY #ifdef MY_ATOMIC_MODE_DUMMY
...@@ -110,6 +130,9 @@ my_atomic_load16(int16 volatile *a) { return (*a); } ...@@ -110,6 +130,9 @@ my_atomic_load16(int16 volatile *a) { return (*a); }
STATIC_INLINE int32 STATIC_INLINE int32
my_atomic_load32(int32 volatile *a) { return (*a); } my_atomic_load32(int32 volatile *a) { return (*a); }
STATIC_INLINE int64
my_atomic_load64(int64 volatile *a) { return (*a); }
STATIC_INLINE void * STATIC_INLINE void *
my_atomic_loadptr(void * volatile *a) { return (*a); } my_atomic_loadptr(void * volatile *a) { return (*a); }
...@@ -124,6 +147,9 @@ my_atomic_store16(int16 volatile *a, int16 v) { *a = v; } ...@@ -124,6 +147,9 @@ my_atomic_store16(int16 volatile *a, int16 v) { *a = v; }
STATIC_INLINE void STATIC_INLINE void
my_atomic_store32(int32 volatile *a, int32 v) { *a = v; } my_atomic_store32(int32 volatile *a, int32 v) { *a = v; }
STATIC_INLINE void
my_atomic_store64(int64 volatile *a, int64 v) { *a = v; }
STATIC_INLINE void STATIC_INLINE void
my_atomic_storeptr(void * volatile *a, void *v) { *a = v; } my_atomic_storeptr(void * volatile *a, void *v) { *a = v; }
...@@ -149,6 +175,12 @@ my_atomic_load32(int32 volatile *a) ...@@ -149,6 +175,12 @@ my_atomic_load32(int32 volatile *a)
return ((int32) atomic_or_32_nv((volatile uint32_t *)a, 0)); return ((int32) atomic_or_32_nv((volatile uint32_t *)a, 0));
} }
STATIC_INLINE int64
my_atomic_load64(int64 volatile *a)
{
return ((int64) atomic_or_64_nv((volatile uint64_t *)a, 0));
}
STATIC_INLINE void * STATIC_INLINE void *
my_atomic_loadptr(void * volatile *a) my_atomic_loadptr(void * volatile *a)
{ {
...@@ -175,6 +207,12 @@ my_atomic_store32(int32 volatile *a, int32 v) ...@@ -175,6 +207,12 @@ my_atomic_store32(int32 volatile *a, int32 v)
(void) atomic_swap_32((volatile uint32_t *)a, (uint32_t)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 STATIC_INLINE void
my_atomic_storeptr(void * volatile *a, void *v) my_atomic_storeptr(void * volatile *a, void *v)
{ {
...@@ -203,6 +241,12 @@ my_atomic_fas32(int32 volatile *a, int32 v) ...@@ -203,6 +241,12 @@ my_atomic_fas32(int32 volatile *a, int32 v)
return ((int32) atomic_swap_32((volatile uint32_t *)a, (uint32_t)v)); return ((int32) atomic_swap_32((volatile uint32_t *)a, (uint32_t)v));
} }
STATIC_INLINE int64
my_atomic_fas64(int64 volatile *a, int64 v)
{
return ((int64) atomic_swap_64((volatile uint64_t *)a, (uint64_t)v));
}
STATIC_INLINE void * STATIC_INLINE void *
my_atomic_fasptr(void * volatile *a, void *v) my_atomic_fasptr(void * volatile *a, void *v)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment