tsan: intercept libc __res_iclose

this is required to catch close of file descriptors created in getaddrinfo()

llvm-svn: 174624
This commit is contained in:
Dmitry Vyukov 2013-02-07 15:27:45 +00:00
parent 804f9116e5
commit effd98b0f4
5 changed files with 32 additions and 0 deletions

View File

@ -1357,6 +1357,18 @@ TSAN_INTERCEPTOR(int, __close, int fd) {
return REAL(__close)(fd);
}
// glibc guts
TSAN_INTERCEPTOR(void, __res_iclose, void *state, bool free_addr) {
SCOPED_TSAN_INTERCEPTOR(__res_iclose, state, free_addr);
int fds[64];
int cnt = ExtractResolvFDs(state, fds, ARRAY_SIZE(fds));
for (int i = 0; i < cnt; i++) {
if (fds[i] > 0)
FdClose(thr, pc, fds[i]);
}
REAL(__res_iclose)(state, free_addr);
}
TSAN_INTERCEPTOR(int, pipe, int *pipefd) {
SCOPED_TSAN_INTERCEPTOR(pipe, pipefd);
int res = REAL(pipe)(pipefd);
@ -1932,6 +1944,8 @@ void InitializeInterceptors() {
TSAN_INTERCEPT(epoll_create);
TSAN_INTERCEPT(epoll_create1);
TSAN_INTERCEPT(close);
TSAN_INTERCEPT(__close);
TSAN_INTERCEPT(__res_iclose);
TSAN_INTERCEPT(pipe);
TSAN_INTERCEPT(pipe2);

View File

@ -151,6 +151,7 @@ bool IsGlobalVar(uptr addr);
uptr GetTlsSize();
void GetThreadStackAndTls(bool main, uptr *stk_addr, uptr *stk_size,
uptr *tls_addr, uptr *tls_size);
int ExtractResolvFDs(void *state, int *fds, int nfd);
} // namespace __tsan

View File

@ -40,6 +40,8 @@
#include <errno.h>
#include <sched.h>
#include <dlfcn.h>
#define __need_res_state
#include <resolv.h>
extern "C" int arch_prctl(int code, __sanitizer::uptr *addr);
@ -289,6 +291,19 @@ bool IsGlobalVar(uptr addr) {
return g_data_start && addr >= g_data_start && addr < g_data_end;
}
#ifndef TSAN_GO
int ExtractResolvFDs(void *state, int *fds, int nfd) {
int cnt = 0;
__res_state *statp = (__res_state*)state;
for (int i = 0; i < MAXNS && cnt < nfd; i++) {
if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
fds[cnt++] = statp->_u._ext.nssocks[i];
}
return cnt;
}
#endif
} // namespace __tsan
#endif // #ifdef __linux__

View File

@ -215,6 +215,7 @@ void StatOutput(u64 *stat) {
name[StatInt_epoll_create1] = " epoll_create1 ";
name[StatInt_close] = " close ";
name[StatInt___close] = " __close ";
name[StatInt___res_iclose] = " __res_iclose ";
name[StatInt_pipe] = " pipe ";
name[StatInt_pipe2] = " pipe2 ";
name[StatInt_read] = " read ";

View File

@ -210,6 +210,7 @@ enum StatType {
StatInt_epoll_create1,
StatInt_close,
StatInt___close,
StatInt___res_iclose,
StatInt_pipe,
StatInt_pipe2,
StatInt_read,