diff options
| author | Alexander Potapenko <glider@google.com> | 2012-09-11 11:59:05 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2012-09-11 11:59:05 +0000 |
| commit | 223ff76d894fea012086da0413afbf219221d718 (patch) | |
| tree | c65f1ba3d9e4bbd310f3e4ac9ff4cf3633bcef07 /lib | |
| parent | 34fc56c43f60be0b85a0e3ce30658fd98951f0b8 (diff) | |
Revert the lockf() support.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163614 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tsan/rtl/tsan_interceptors.cc | 34 | ||||
| -rw-r--r-- | lib/tsan/rtl/tsan_stat.cc | 2 | ||||
| -rw-r--r-- | lib/tsan/rtl/tsan_stat.h | 2 |
3 files changed, 0 insertions, 38 deletions
diff --git a/lib/tsan/rtl/tsan_interceptors.cc b/lib/tsan/rtl/tsan_interceptors.cc index 2e024a87e..80b69b3a9 100644 --- a/lib/tsan/rtl/tsan_interceptors.cc +++ b/lib/tsan/rtl/tsan_interceptors.cc @@ -1204,38 +1204,6 @@ TSAN_INTERCEPTOR(long_t, pwritev64, int fd, void *vec, int cnt, u64 off) { return res; } -// |func| is either lockf or lockf64. -#define LOCKF_BODY(func) \ - SCOPED_TSAN_INTERCEPTOR(func, fd, cmd, len); \ - int res = -1; \ - switch (cmd) { \ - case F_ULOCK: { \ - Release(thr, pc, fd2addr(fd)); \ - res = REAL(func)(fd, cmd, len); \ - break; \ - } \ - case F_LOCK: \ - case F_TLOCK: { \ - res = REAL(func)(fd, cmd, len); \ - if (res != -1) Acquire(thr, pc, fd2addr(fd)); \ - break; \ - } \ - default: { \ - res = REAL(func)(fd, cmd, len); \ - break; \ - } \ - } \ - return res; \ -/**/ - -TSAN_INTERCEPTOR(int, lockf, int fd, int cmd, unsigned len) { - LOCKF_BODY(lockf); -} - -TSAN_INTERCEPTOR(int, lockf64, int fd, int cmd, u64 len) { - LOCKF_BODY(lockf64); -} - TSAN_INTERCEPTOR(long_t, send, int fd, void *buf, long_t len, int flags) { SCOPED_TSAN_INTERCEPTOR(send, fd, buf, len, flags); Release(thr, pc, fd2addr(fd)); @@ -1609,8 +1577,6 @@ void InitializeInterceptors() { TSAN_INTERCEPT(pwrite64); TSAN_INTERCEPT(writev); TSAN_INTERCEPT(pwritev64); - TSAN_INTERCEPT(lockf); - TSAN_INTERCEPT(lockf64); TSAN_INTERCEPT(send); TSAN_INTERCEPT(sendmsg); TSAN_INTERCEPT(recv); diff --git a/lib/tsan/rtl/tsan_stat.cc b/lib/tsan/rtl/tsan_stat.cc index 671ae5642..a7c33a5de 100644 --- a/lib/tsan/rtl/tsan_stat.cc +++ b/lib/tsan/rtl/tsan_stat.cc @@ -183,8 +183,6 @@ void StatOutput(u64 *stat) { name[StatInt_pwrite64] = " pwrite64 "; name[StatInt_writev] = " writev "; name[StatInt_pwritev64] = " pwritev64 "; - name[StatInt_lockf] = " lockf "; - name[StatInt_lockf64] = " lockf64 "; name[StatInt_send] = " send "; name[StatInt_sendmsg] = " sendmsg "; name[StatInt_recv] = " recv "; diff --git a/lib/tsan/rtl/tsan_stat.h b/lib/tsan/rtl/tsan_stat.h index 08cd1ded8..d99491f74 100644 --- a/lib/tsan/rtl/tsan_stat.h +++ b/lib/tsan/rtl/tsan_stat.h @@ -181,8 +181,6 @@ enum StatType { StatInt_pwrite64, StatInt_writev, StatInt_pwritev64, - StatInt_lockf, - StatInt_lockf64, StatInt_send, StatInt_sendmsg, StatInt_recv, |