diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | atomic/os390/atomic.c | 24 |
2 files changed, 27 insertions, 0 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes for APR 1.3.0 + *) Implement apr_atomic_casptr() for z/OS. + [David Jones <oscaremma gmail.com>] + *) Fill in apr_fileinfo_t member st_csize on Netware and Unix (PR 41678), and refine the file times down to apr_time_t resolution if supported by a st_atimensec or st_atim.tv_nsec value by the OS. Additional diff --git a/atomic/os390/atomic.c b/atomic/os390/atomic.c index 35ddf1c22..3c57668be 100644 --- a/atomic/os390/atomic.c +++ b/atomic/os390/atomic.c @@ -82,6 +82,30 @@ apr_uint32_t apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t swap, return old; /* old is automatically updated from mem on cs failure */ } +#if APR_SIZEOF_VOIDP == 4 +void *apr_atomic_casptr(volatile void **mem_ptr, + void *swap_ptr, + const void *cmp_ptr) +{ + __cs1(&cmp_ptr, /* automatically updated from mem on __cs1 failure */ + mem_ptr, /* set from swap when __cs1 succeeds */ + &swap_ptr); + return (void *)cmp_ptr; +} +#elif APR_SIZEOF_VOIDP == 8 +void *apr_atomic_casptr(volatile void **mem_ptr, + void *swap_ptr, + const void *cmp_ptr) +{ + __csg(&cmp_ptr, /* automatically updated from mem on __csg failure */ + mem_ptr, /* set from swap when __csg succeeds */ + &swap_ptr); + return (void *)cmp_ptr; +} +#else +#error APR_SIZEOF_VOIDP value not supported +#endif /* APR_SIZEOF_VOIDP */ + apr_uint32_t apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val) { apr_uint32_t old, new_val; |