aboutsummaryrefslogtreecommitdiff
path: root/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2016-09-03 21:41:29 +0000
committerDimitry Andric <dim@FreeBSD.org>2016-09-03 21:41:29 +0000
commit53b715b5ba3f838ab20de8d3f34297c6555c7981 (patch)
tree264810938cd5b02b228fb2193588d88398d58d83 /contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h
parentc22165b4f1f5d38b681921797a44b3ba8c13b7e0 (diff)
parentb58b5b4a2eef87f528c56a9e91d9bfeba74ac210 (diff)
downloadsrc-53b715b5ba3f838ab20de8d3f34297c6555c7981.tar.gz
src-53b715b5ba3f838ab20de8d3f34297c6555c7981.zip
Update compiler-rt to 3.9.0 release, and update the build glue for
libcompiler_rt and libclang_rt.
Notes
Notes: svn path=/projects/clang390-import/; revision=305364
Diffstat (limited to 'contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h')
-rw-r--r--contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h b/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h
index f07ea3b9776b..2bc2f41fbe26 100644
--- a/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h
+++ b/contrib/compiler-rt/lib/tsan/rtl/tsan_sync.h
@@ -47,7 +47,7 @@ struct SyncVar {
SyncClock clock;
void Init(ThreadState *thr, uptr pc, uptr addr, u64 uid);
- void Reset(ThreadState *thr);
+ void Reset(Processor *proc);
u64 GetId() const {
// 47 lsb is addr, then 14 bits is low part of uid, then 3 zero bits.
@@ -72,18 +72,18 @@ class MetaMap {
MetaMap();
void AllocBlock(ThreadState *thr, uptr pc, uptr p, uptr sz);
- uptr FreeBlock(ThreadState *thr, uptr pc, uptr p);
- bool FreeRange(ThreadState *thr, uptr pc, uptr p, uptr sz);
- void ResetRange(ThreadState *thr, uptr pc, uptr p, uptr sz);
+ uptr FreeBlock(Processor *proc, uptr p);
+ bool FreeRange(Processor *proc, uptr p, uptr sz);
+ void ResetRange(Processor *proc, uptr p, uptr sz);
MBlock* GetBlock(uptr p);
SyncVar* GetOrCreateAndLock(ThreadState *thr, uptr pc,
uptr addr, bool write_lock);
- SyncVar* GetIfExistsAndLock(uptr addr);
+ SyncVar* GetIfExistsAndLock(uptr addr, bool write_lock);
void MoveMemory(uptr src, uptr dst, uptr sz);
- void OnThreadIdle(ThreadState *thr);
+ void OnProcIdle(Processor *proc);
private:
static const u32 kFlagMask = 3u << 30;