d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dedup zpcpu assertions into one macro and guard the rest with #ifndef

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mateusz Guzik 2020-02-12 11:14:23 +00:00
parent fb886947d9
commit bee115bc59
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/sys/pcpu.h
View File

@ -228,6 +228,10 @@ extern struct pcpu *cpuid_to_pcpu[];
#endif
#define curproc (curthread->td_proc)
#ifndef ZPCPU_ASSERT_PROTECTED
#define ZPCPU_ASSERT_PROTECTED() MPASS(curthread->td_critnest > 0)
#endif
#ifndef zpcpu_offset_cpu
#define zpcpu_offset_cpu(cpu) (UMA_PCPU_ALLOC_SIZE * cpu)
#endif
@ -277,26 +281,32 @@ extern struct pcpu *cpuid_to_pcpu[];
_old; \
})
#ifndef zpcpu_set_protected
#define zpcpu_set_protected(base, val) ({ \
MPASS(curthread->td_critnest > 0); \
ZPCPU_ASSERT_PROTECTED(); \
__typeof(val) *_ptr = zpcpu_get(base); \
\
*_ptr = (val); \
})
#endif
#ifndef zpcpu_add_protected
#define zpcpu_add_protected(base, val) ({ \
MPASS(curthread->td_critnest > 0); \
ZPCPU_ASSERT_PROTECTED(); \
__typeof(val) *_ptr = zpcpu_get(base); \
\
*_ptr += (val); \
})
#endif
#ifndef zpcpu_sub_protected
#define zpcpu_sub_protected(base, val) ({ \
MPASS(curthread->td_critnest > 0); \
ZPCPU_ASSERT_PROTECTED(); \
__typeof(val) *_ptr = zpcpu_get(base); \
\
*_ptr -= (val); \
})
#endif
/*
* Machine dependent callouts. cpu_pcpu_init() is responsible for