Deleted Added
full compact
counter.h (249268) counter.h (252434)
1/*-
2 * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/arm/include/counter.h 249268 2013-04-08 19:40:53Z glebius $
26 * $FreeBSD: head/sys/arm/include/counter.h 252434 2013-07-01 02:48:27Z kib $
27 */
28
29#ifndef __MACHINE_COUNTER_H__
30#define __MACHINE_COUNTER_H__
31
32#include <sys/pcpu.h>
33#ifdef INVARIANTS
34#include <sys/proc.h>
35#endif
36
37#define counter_enter() critical_enter()
38#define counter_exit() critical_exit()
39
27 */
28
29#ifndef __MACHINE_COUNTER_H__
30#define __MACHINE_COUNTER_H__
31
32#include <sys/pcpu.h>
33#ifdef INVARIANTS
34#include <sys/proc.h>
35#endif
36
37#define counter_enter() critical_enter()
38#define counter_exit() critical_exit()
39
40#ifdef IN_SUBR_COUNTER_C
41/* XXXKIB non-atomic 64bit read */
42static inline uint64_t
43counter_u64_read_one(uint64_t *p, int cpu)
44{
45
46 return (*(uint64_t *)((char *)p + sizeof(struct pcpu) * cpu));
47}
48
49static inline uint64_t
50counter_u64_fetch_inline(uint64_t *p)
51{
52 uint64_t r;
53 int i;
54
55 r = 0;
56 for (i = 0; i < mp_ncpus; i++)
57 r += counter_u64_read_one((uint64_t *)p, i);
58
59 return (r);
60}
61
62/* XXXKIB non-atomic 64bit store, might interrupt increment */
63static void
64counter_u64_zero_one_cpu(void *arg)
65{
66
67 *((uint64_t *)((char *)arg + sizeof(struct pcpu) *
68 PCPU_GET(cpuid))) = 0;
69}
70
71static inline void
72counter_u64_zero_inline(counter_u64_t c)
73{
74
75 smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
76 smp_no_rendevous_barrier, c);
77}
78#endif
79
40#define counter_u64_add_protected(c, inc) do { \
41 CRITICAL_ASSERT(curthread); \
42 *(uint64_t *)zpcpu_get(c) += (inc); \
43} while (0)
44
45static inline void
46counter_u64_add(counter_u64_t c, int64_t inc)
47{
48
49 counter_enter();
50 counter_u64_add_protected(c, inc);
51 counter_exit();
52}
53
54#endif /* ! __MACHINE_COUNTER_H__ */
80#define counter_u64_add_protected(c, inc) do { \
81 CRITICAL_ASSERT(curthread); \
82 *(uint64_t *)zpcpu_get(c) += (inc); \
83} while (0)
84
85static inline void
86counter_u64_add(counter_u64_t c, int64_t inc)
87{
88
89 counter_enter();
90 counter_u64_add_protected(c, inc);
91 counter_exit();
92}
93
94#endif /* ! __MACHINE_COUNTER_H__ */