mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[t:2216] Windows port of 2216 Showed that windows fetch_and_increment was returning incremented (not original) result.

Browse source 
Atomic functions now return the original

git-svn-id: file:///svn/toku/tokudb@18187 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Yoni Fogel 2013-04-16 23:59:01 -04:00
parent 465be5c1f1
commit fa8ef6da1f
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
toku_include/toku_atomic.h
View file

@ -10,12 +10,18 @@ toku_sync_fetch_and_add_uint32(volatile uint32_t *a, uint32_t b) {
static inline uint32_t static inline uint32_t
toku_sync_fetch_and_increment_uint32(volatile uint32_t *a) { toku_sync_fetch_and_increment_uint32(volatile uint32_t *a) {
return _InterlockedIncrement((LONG*)a); uint32_t r = _InterlockedIncrement((LONG*)a);
//InterlockedIncrement returns the result, not original.
//Return the original.
return r - 1;
} }
static inline uint32_t static inline uint32_t
toku_sync_fetch_and_decrement_uint32(volatile uint32_t *a) { toku_sync_fetch_and_decrement_uint32(volatile uint32_t *a) {
return _InterlockedDecrement((LONG*)a); uint32_t r = _InterlockedDecrement((LONG*)a);
//InterlockedDecrement returns the result, not original.
//Return the original.
return r + 1;
} }
static inline int32_t static inline int32_t
@ -53,19 +59,22 @@ toku_sync_fetch_and_add_uint64(volatile uint64_t *a, uint64_t b) {
//Temporarily just use 32 bit atomic instructions (treat the values as 32 //Temporarily just use 32 bit atomic instructions (treat the values as 32
//bit only). For now this is ok, the values are only used in show engine //bit only). For now this is ok, the values are only used in show engine
//status. //status.
return _InterlockedExchangeAdd((LONG*)a, b); return toku_sync_fetch_and_add_uint32((uint32_t*)a, b);
#endif #endif
} }
static inline uint64_t static inline uint64_t
toku_sync_fetch_and_increment_uint64(volatile uint64_t *a) { toku_sync_fetch_and_increment_uint64(volatile uint64_t *a) {
#if TOKU_WINDOWS_HAS_ATOMIC_64 #if TOKU_WINDOWS_HAS_ATOMIC_64
return _InterlockedIncrement64((int64_t*)a); uint64_t r = _InterlockedIncrement64((int64_t*)a);
//InterlockedIncrement64 returns the result, not original.
//Return the original.
return r - 1;
#else #else
//Temporarily just use 32 bit atomic instructions (treat the values as 32 //Temporarily just use 32 bit atomic instructions (treat the values as 32
//bit only). For now this is ok, the values are only used in show engine //bit only). For now this is ok, the values are only used in show engine
//status. //status.
return _InterlockedIncrement((LONG*)a); return toku_sync_fetch_and_increment_uint32((uint32_t*)a);
#endif #endif
} }