technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Macros for atomic 'OR' and 'AND' operations introduced.

Browse Source 
Compiler built-ins used, where possible. Necessary configure checks added.
New macros:
    nxt_atomic_or_fetch(ptr, val)
    nxt_atomic_and_fetch(ptr, val)

Syntax and behaviour is similar to __sync_or_and_fetch and __sync_and_and_fetch
GCC build-ins.
This commit is contained in:
Max Romanov
2017-04-21 16:55:13 +03:00
parent 6e7f98d6ae
commit cfed068c1d
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
auto/atomic
View File

@@ -21,6 +21,10 @@ nxt_feature_test="int main() {
return 1; return 1;
if (n != 5) if (n != 5)
return 1; return 1;
if (__sync_or_and_fetch(&n, 2) != 7)
return 1;
if (__sync_and_and_fetch(&n, 5) != 5)
return 1;
__sync_lock_release(&n); __sync_lock_release(&n);
if (n != 0) if (n != 0)
return 1; return 1;
@@ -51,6 +55,10 @@ if [ $nxt_found = no ]; then
return 1; return 1;
if (n != 5) if (n != 5)
return 1; return 1;
if (atomic_or_ulong_nv(&n, 2) != 7)
return 1;
if (atomic_and_ulong_nv(&n, 5) != 5)
return 1;
return 0; return 0;
}" }"
. auto/feature . auto/feature

17
src/nxt_atomic.h
View File

@@ -51,6 +51,14 @@ nxt_atomic_release(lock) \
__sync_lock_release(lock) __sync_lock_release(lock)
#define nxt_atomic_or_fetch(ptr, val) \
__sync_or_and_fetch(ptr, val)
#define nxt_atomic_and_fetch(ptr, val) \
__sync_and_and_fetch(ptr, val)
#if (__i386__ || __i386 || __amd64__ || __amd64) #if (__i386__ || __i386 || __amd64__ || __amd64)
#define \ #define \
nxt_cpu_pause() \ nxt_cpu_pause() \
@@ -85,6 +93,15 @@ nxt_atomic_xchg(lock, set) \
nxt_atomic_fetch_add(value, add) \ nxt_atomic_fetch_add(value, add) \
(atomic_add_long_nv(value, add) - add) (atomic_add_long_nv(value, add) - add)
#define nxt_atomic_or_fetch(ptr, val) \
atomic_or_ulong_nv(ptr, val)
#define nxt_atomic_and_fetch(ptr, val) \
atomic_and_ulong_nv(ptr, val)
/* /*
* Solaris uses SPARC Total Store Order model. In this model: * Solaris uses SPARC Total Store Order model. In this model:
* 1) Each atomic load-store instruction behaves as if it were followed by * 1) Each atomic load-store instruction behaves as if it were followed by