mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
qemu/compiler: Absorb 'clang-tsa.h'
We already have "qemu/compiler.h" for compiler-specific arrangements, automatically included by "qemu/osdep.h" for each source file. No need to explicitly include a header for a Clang particularity. Suggested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20250117170201.91182-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé
parent
e8a0110293
commit
82c4d8a3b4
11 changed files with 96 additions and 125 deletions
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/block_int.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
#include "qemu/job.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qapi/qapi-commands-block-core.h"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ extern char **environ;
|
|||
#include "target.h"
|
||||
#include "exec/gdbstub.h"
|
||||
#include "exec/page-protection.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
#include "accel/tcg/vcpu-state.h"
|
||||
|
||||
#include "qemu-os.h"
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#include "block/block-common.h"
|
||||
#include "block/block-global-state.h"
|
||||
#include "block/snapshot.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "qemu/rcu.h"
|
||||
#include "qemu/stats64.h"
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@
|
|||
#ifndef GRAPH_LOCK_H
|
||||
#define GRAPH_LOCK_H
|
||||
|
||||
#include "qemu/clang-tsa.h"
|
||||
|
||||
/**
|
||||
* Graph Lock API
|
||||
* This API provides a rwlock used to protect block layer
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@
|
|||
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
|
||||
#include "qemu/clang-tsa.h"
|
||||
|
||||
void TSA_NO_TSA mmap_lock(void);
|
||||
void TSA_NO_TSA mmap_unlock(void);
|
||||
bool have_mmap_lock(void);
|
||||
|
|
|
|||
|
|
@ -1,114 +0,0 @@
|
|||
#ifndef CLANG_TSA_H
|
||||
#define CLANG_TSA_H
|
||||
|
||||
/*
|
||||
* Copyright 2018 Jarkko Hietaniemi <jhi@iki.fi>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without
|
||||
* limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/* http://clang.llvm.org/docs/ThreadSafetyAnalysis.html
|
||||
*
|
||||
* TSA is available since clang 3.6-ish.
|
||||
*/
|
||||
#ifdef __clang__
|
||||
# define TSA(x) __attribute__((x))
|
||||
#else
|
||||
# define TSA(x) /* No TSA, make TSA attributes no-ops. */
|
||||
#endif
|
||||
|
||||
/* TSA_CAPABILITY() is used to annotate typedefs:
|
||||
*
|
||||
* typedef pthread_mutex_t TSA_CAPABILITY("mutex") tsa_mutex;
|
||||
*/
|
||||
#define TSA_CAPABILITY(x) TSA(capability(x))
|
||||
|
||||
/* TSA_GUARDED_BY() is used to annotate global variables,
|
||||
* the data is guarded:
|
||||
*
|
||||
* Foo foo TSA_GUARDED_BY(mutex);
|
||||
*/
|
||||
#define TSA_GUARDED_BY(x) TSA(guarded_by(x))
|
||||
|
||||
/* TSA_PT_GUARDED_BY() is used to annotate global pointers, the data
|
||||
* behind the pointer is guarded.
|
||||
*
|
||||
* Foo* ptr TSA_PT_GUARDED_BY(mutex);
|
||||
*/
|
||||
#define TSA_PT_GUARDED_BY(x) TSA(pt_guarded_by(x))
|
||||
|
||||
/* The TSA_REQUIRES() is used to annotate functions: the caller of the
|
||||
* function MUST hold the resource, the function will NOT release it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_REQUIRES(mutex);
|
||||
*/
|
||||
#define TSA_REQUIRES(...) TSA(requires_capability(__VA_ARGS__))
|
||||
#define TSA_REQUIRES_SHARED(...) TSA(requires_shared_capability(__VA_ARGS__))
|
||||
|
||||
/* TSA_EXCLUDES() is used to annotate functions: the caller of the
|
||||
* function MUST NOT hold resource, the function first acquires the
|
||||
* resource, and then releases it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_EXCLUDES(mutex);
|
||||
*/
|
||||
#define TSA_EXCLUDES(...) TSA(locks_excluded(__VA_ARGS__))
|
||||
|
||||
/* TSA_ACQUIRE() is used to annotate functions: the caller of the
|
||||
* function MUST NOT hold the resource, the function will acquire the
|
||||
* resource, but NOT release it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_ACQUIRE(mutex);
|
||||
*/
|
||||
#define TSA_ACQUIRE(...) TSA(acquire_capability(__VA_ARGS__))
|
||||
#define TSA_ACQUIRE_SHARED(...) TSA(acquire_shared_capability(__VA_ARGS__))
|
||||
|
||||
/* TSA_RELEASE() is used to annotate functions: the caller of the
|
||||
* function MUST hold the resource, but the function will then release it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_RELEASE(mutex);
|
||||
*/
|
||||
#define TSA_RELEASE(...) TSA(release_capability(__VA_ARGS__))
|
||||
#define TSA_RELEASE_SHARED(...) TSA(release_shared_capability(__VA_ARGS__))
|
||||
|
||||
/* TSA_NO_TSA is used to annotate functions. Use only when you need to.
|
||||
*
|
||||
* void Foo(void) TSA_NO_TSA;
|
||||
*/
|
||||
#define TSA_NO_TSA TSA(no_thread_safety_analysis)
|
||||
|
||||
/*
|
||||
* TSA_ASSERT() is used to annotate functions: This function will assert that
|
||||
* the lock is held. When it returns, the caller of the function is assumed to
|
||||
* already hold the resource.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*/
|
||||
#define TSA_ASSERT(...) TSA(assert_capability(__VA_ARGS__))
|
||||
#define TSA_ASSERT_SHARED(...) TSA(assert_shared_capability(__VA_ARGS__))
|
||||
|
||||
#endif /* #ifndef CLANG_TSA_H */
|
||||
|
|
@ -207,6 +207,102 @@
|
|||
# define QEMU_USED
|
||||
#endif
|
||||
|
||||
/*
|
||||
* http://clang.llvm.org/docs/ThreadSafetyAnalysis.html
|
||||
*
|
||||
* TSA is available since clang 3.6-ish.
|
||||
*/
|
||||
#ifdef __clang__
|
||||
# define TSA(x) __attribute__((x))
|
||||
#else
|
||||
# define TSA(x) /* No TSA, make TSA attributes no-ops. */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* TSA_CAPABILITY() is used to annotate typedefs:
|
||||
*
|
||||
* typedef pthread_mutex_t TSA_CAPABILITY("mutex") tsa_mutex;
|
||||
*/
|
||||
#define TSA_CAPABILITY(x) TSA(capability(x))
|
||||
|
||||
/*
|
||||
* TSA_GUARDED_BY() is used to annotate global variables,
|
||||
* the data is guarded:
|
||||
*
|
||||
* Foo foo TSA_GUARDED_BY(mutex);
|
||||
*/
|
||||
#define TSA_GUARDED_BY(x) TSA(guarded_by(x))
|
||||
|
||||
/*
|
||||
* TSA_PT_GUARDED_BY() is used to annotate global pointers, the data
|
||||
* behind the pointer is guarded.
|
||||
*
|
||||
* Foo* ptr TSA_PT_GUARDED_BY(mutex);
|
||||
*/
|
||||
#define TSA_PT_GUARDED_BY(x) TSA(pt_guarded_by(x))
|
||||
|
||||
/*
|
||||
* The TSA_REQUIRES() is used to annotate functions: the caller of the
|
||||
* function MUST hold the resource, the function will NOT release it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_REQUIRES(mutex);
|
||||
*/
|
||||
#define TSA_REQUIRES(...) TSA(requires_capability(__VA_ARGS__))
|
||||
#define TSA_REQUIRES_SHARED(...) TSA(requires_shared_capability(__VA_ARGS__))
|
||||
|
||||
/*
|
||||
* TSA_EXCLUDES() is used to annotate functions: the caller of the
|
||||
* function MUST NOT hold resource, the function first acquires the
|
||||
* resource, and then releases it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_EXCLUDES(mutex);
|
||||
*/
|
||||
#define TSA_EXCLUDES(...) TSA(locks_excluded(__VA_ARGS__))
|
||||
|
||||
/*
|
||||
* TSA_ACQUIRE() is used to annotate functions: the caller of the
|
||||
* function MUST NOT hold the resource, the function will acquire the
|
||||
* resource, but NOT release it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_ACQUIRE(mutex);
|
||||
*/
|
||||
#define TSA_ACQUIRE(...) TSA(acquire_capability(__VA_ARGS__))
|
||||
#define TSA_ACQUIRE_SHARED(...) TSA(acquire_shared_capability(__VA_ARGS__))
|
||||
|
||||
/*
|
||||
* TSA_RELEASE() is used to annotate functions: the caller of the
|
||||
* function MUST hold the resource, but the function will then release it.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*
|
||||
* void Foo(void) TSA_RELEASE(mutex);
|
||||
*/
|
||||
#define TSA_RELEASE(...) TSA(release_capability(__VA_ARGS__))
|
||||
#define TSA_RELEASE_SHARED(...) TSA(release_shared_capability(__VA_ARGS__))
|
||||
|
||||
/*
|
||||
* TSA_NO_TSA is used to annotate functions. Use only when you need to.
|
||||
*
|
||||
* void Foo(void) TSA_NO_TSA;
|
||||
*/
|
||||
#define TSA_NO_TSA TSA(no_thread_safety_analysis)
|
||||
|
||||
/*
|
||||
* TSA_ASSERT() is used to annotate functions: This function will assert that
|
||||
* the lock is held. When it returns, the caller of the function is assumed to
|
||||
* already hold the resource.
|
||||
*
|
||||
* More than one mutex may be specified, comma-separated.
|
||||
*/
|
||||
#define TSA_ASSERT(...) TSA(assert_capability(__VA_ARGS__))
|
||||
#define TSA_ASSERT_SHARED(...) TSA(assert_shared_capability(__VA_ARGS__))
|
||||
|
||||
/*
|
||||
* Ugly CPP trick that is like "defined FOO", but also works in C
|
||||
* code. Useful to replace #ifdef with "if" statements; assumes
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
#include "qemu/processor.h"
|
||||
#include "qemu/atomic.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
|
||||
typedef struct QemuCond QemuCond;
|
||||
typedef struct QemuSemaphore QemuSemaphore;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#include "system/block-backend.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
#include "iothread.h"
|
||||
|
||||
static QemuEvent done_event;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include "system/block-backend.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qobject/qdict.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "iothread.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include "qemu-thread-common.h"
|
||||
#include "qemu/tsan.h"
|
||||
#include "qemu/bitmap.h"
|
||||
#include "qemu/clang-tsa.h"
|
||||
|
||||
#ifdef CONFIG_PTHREAD_SET_NAME_NP
|
||||
#include <pthread_np.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue