Attachment #20458 for bug #42806

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




    return APR_SUCCESS;
}

APR_DECLARE(apr_uint32_t) apr_atomic_read32(apr_uint32_t *mem)
{
    __sync_synchronize();

    return *mem;
}

APR_DECLARE(void) apr_atomic_set32(apr_uint32_t *mem, apr_uint32_t val)
{
    *mem = val;

    __sync_synchronize();
}

APR_DECLARE(apr_uint32_t) apr_atomic_add32(apr_uint32_t *mem, apr_uint32_t val)
{
    return __sync_fetch_and_add(mem, val);
}

APR_DECLARE(void) apr_atomic_sub32(apr_uint32_t *mem, apr_uint32_t val)
{
    __sync_fetch_and_sub(mem, val);
}

APR_DECLARE(apr_uint32_t) apr_atomic_inc32(apr_uint32_t *mem)
{
    return __sync_fetch_and_add(mem, 1);
}

APR_DECLARE(int) apr_atomic_dec32(apr_uint32_t *mem)
{
    return __sync_sub_and_fetch(mem, 1);
}

APR_DECLARE(apr_uint32_t) apr_atomic_cas32(apr_uint32_t *mem, apr_uint32_t with,
                                           apr_uint32_t cmp)
{
    return __sync_val_compare_and_swap(mem, cmp, with);
}

APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(apr_uint32_t *mem, apr_uint32_t val)
{
    __sync_synchronize();

    return __sync_lock_test_and_set(mem, val);
}

APR_DECLARE(void*) apr_atomic_casptr(void **mem, void *with, void *cmp)
{
    return (void*) __sync_val_compare_and_swap(mem, cmp, with);
}

Return to bug 42806

Lines 23-72 APR_DECLARE(apr_status_t) apr_atomic_ini Link Here

(-)apr/atomic/unix/builtins.c (-9 / +13 lines)
23	return APR_SUCCESS;	23	return APR_SUCCESS;
24	}	24	}
25		25
26	APR_DECLARE(apr_uint32_t) apr_atomic_read32(volatile apr_uint32_t *mem)	26	APR_DECLARE(apr_uint32_t) apr_atomic_read32(apr_uint32_t *mem)
27	{	27	{
		28	__sync_synchronize();
		29
28	return *mem;	30	return *mem;
29	}	31	}
30		32
31	APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)	33	APR_DECLARE(void) apr_atomic_set32(apr_uint32_t *mem, apr_uint32_t val)
32	{	34	{
33	*mem = val;	35	*mem = val;
		36
		37	__sync_synchronize();
34	}	38	}
35		39
36	APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)	40	APR_DECLARE(apr_uint32_t) apr_atomic_add32(apr_uint32_t *mem, apr_uint32_t val)
37	{	41	{
38	return __sync_fetch_and_add(mem, val);	42	return __sync_fetch_and_add(mem, val);
39	}	43	}
40		44
41	APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)	45	APR_DECLARE(void) apr_atomic_sub32(apr_uint32_t *mem, apr_uint32_t val)
42	{	46	{
43	__sync_fetch_and_sub(mem, val);	47	__sync_fetch_and_sub(mem, val);
44	}	48	}
45		49
46	APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)	50	APR_DECLARE(apr_uint32_t) apr_atomic_inc32(apr_uint32_t *mem)
47	{	51	{
48	return __sync_fetch_and_add(mem, 1);	52	return __sync_fetch_and_add(mem, 1);
49	}	53	}
50		54
51	APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)	55	APR_DECLARE(int) apr_atomic_dec32(apr_uint32_t *mem)
52	{	56	{
53	return __sync_sub_and_fetch(mem, 1);	57	return __sync_sub_and_fetch(mem, 1);
54	}	58	}
55		59
56	APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint32_t with,	60	APR_DECLARE(apr_uint32_t) apr_atomic_cas32(apr_uint32_t *mem, apr_uint32_t with,
57	apr_uint32_t cmp)	61	apr_uint32_t cmp)
58	{	62	{
59	return __sync_val_compare_and_swap(mem, cmp, with);	63	return __sync_val_compare_and_swap(mem, cmp, with);
60	}	64	}
61		65
62	APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint32_t val)	66	APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(apr_uint32_t *mem, apr_uint32_t val)
63	{	67	{
64	__sync_synchronize();	68	__sync_synchronize();
65		69
66	return __sync_lock_test_and_set(mem, val);	70	return __sync_lock_test_and_set(mem, val);
67	}	71	}
68		72
69	APR_DECLARE(void) apr_atomic_casptr(volatile void mem, void with, const void *cmp)	73	APR_DECLARE(void) apr_atomic_casptr(void mem, void with, void *cmp)
70	{	74	{
71	return (void*) __sync_val_compare_and_swap(mem, cmp, with);	75	return (void*) __sync_val_compare_and_swap(mem, cmp, with);
72	}	76	}