View | Details | Raw Unified | Return to bug 42806
Collapse All | Expand All

(-)apr/include/arch/unix/apr_arch_atomic.h (+2 lines)
Lines 32-37 Link Here
32
#   define USE_ATOMICS_BUILTINS
32
#   define USE_ATOMICS_BUILTINS
33
#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
33
#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
34
#   define USE_ATOMICS_IA32
34
#   define USE_ATOMICS_IA32
35
#elif defined(SOLARIS2) && SOLARIS2 >= 10
36
#   define USE_ATOMICS_SOLARIS
35
#else
37
#else
36
#   define USE_ATOMICS_GENERIC
38
#   define USE_ATOMICS_GENERIC
37
#endif
39
#endif
(-)apr/atomic/unix/solaris.c (+74 lines)
Line 0 Link Here
1
/* Licensed to the Apache Software Foundation (ASF) under one or more
2
 * contributor license agreements.  See the NOTICE file distributed with
3
 * this work for additional information regarding copyright ownership.
4
 * The ASF licenses this file to You under the Apache License, Version 2.0
5
 * (the "License"); you may not use this file except in compliance with
6
 * the License.  You may obtain a copy of the License at
7
 *
8
 *     http://www.apache.org/licenses/LICENSE-2.0
9
 *
10
 * Unless required by applicable law or agreed to in writing, software
11
 * distributed under the License is distributed on an "AS IS" BASIS,
12
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
 * See the License for the specific language governing permissions and
14
 * limitations under the License.
15
 */
16
17
#include "apr_arch_atomic.h"
18
19
#ifdef USE_ATOMICS_SOLARIS
20
21
#include <atomic.h>
22
23
APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
24
{
25
    return APR_SUCCESS;
26
}
27
28
APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)
29
{
30
    return *mem;
31
}
32
33
APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
34
{
35
    *mem = val;
36
}
37
38
APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
39
{
40
    return atomic_add_32_nv(mem, val) - val;
41
}
42
43
APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
44
{
45
    atomic_add_32(mem, -val);
46
}
47
48
APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
49
{
50
    return atomic_inc_32_nv(mem) - 1;
51
}
52
53
APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
54
{
55
    return atomic_dec_32_nv(mem);
56
}
57
58
APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,
59
                                           apr_uint32_t cmp)
60
{
61
    return atomic_cas_32(mem, cmp, with);
62
}
63
64
APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)
65
{
66
    return atomic_swap_32(mem, val);
67
}
68
69
APR_DECLARE(void*) apr_atomic_casptr(volatile void **mem, void *with, const void *cmp)
70
{
71
    return atomic_cas_ptr(mem, cmp, with);
72
}
73
74
#endif /* USE_ATOMICS_SOLARIS */

Return to bug 42806