[llvm-commits] [compiler-rt] r169602 - in /compiler-rt/trunk/lib/tsan/rtl: tsan_interceptors.cc tsan_stat.cc tsan_stat.h

[Dmitry Vyukov]

Author: dvyukov
Date: Fri Dec  7 09:32:56 2012
New Revision: 169602

URL: http://llvm.org/viewvc/llvm-project?rev=169602&view=rev
Log:
tsan: add pipe interceptors

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc
    compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc
    compiler-rt/trunk/lib/tsan/rtl/tsan_stat.h

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=169602&r1=169601&r2=169602&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Fri Dec  7 09:32:56 2012
@@ -309,8 +309,8 @@
 }
 
 enum FdType {
-  FdOther,  // Something we don't know about, global sync.
   FdNone,  // Does not require any sync.
+  FdGlobal,  // Something we don't know about, global sync.
   FdFile,
   FdSock,
   FdPipe,
@@ -327,7 +327,7 @@
   static const int kMaxFds = 10 * 1024;  // Everything else is synced globally.
   FdDesc desc[kMaxFds];
   // Addresses used for synchronization.
-  u64 fdother;
+  u64 fdglobal;
   u64 fdfile;
   u64 fdsock;
   u64 fdpipe;
@@ -338,19 +338,16 @@
 static FdContext fdctx;
 
 static void FdInit() {
-  fdctx.desc[0].type = FdNone;
-  fdctx.desc[1].type = FdNone;
-  fdctx.desc[2].type = FdNone;
 }
 
 static void *FdAddr(int fd) {
   if (fd >= FdContext::kMaxFds)
-    return &fdctx.fdother;
+    return &fdctx.fdglobal;
   FdDesc *desc = &fdctx.desc[fd];
-  if (desc->type == FdOther)
-    return &fdctx.fdother;
   if (desc->type == FdNone)
     return 0;
+  if (desc->type == FdGlobal)
+    return &fdctx.fdglobal;
   if (desc->type == FdFile)
     return &fdctx.fdfile;
   if (desc->type == FdSock)
@@ -377,6 +374,48 @@
     Acquire(thr, pc, (uptr)addr);
 }
 
+static void FdClose(ThreadState *thr, uptr pc, int fd) {
+  if (fd >= FdContext::kMaxFds)
+    return;
+  void *addr = FdAddr(fd);
+  if (addr) {
+    // To catch races between fd usage and close.
+    MemoryWrite1Byte(thr, pc, (uptr)addr);
+    SyncVar *s = CTX()->synctab.GetAndRemove(thr, pc, (uptr)addr);
+    if (s)
+      DestroyAndFree(s);
+  }
+  FdDesc *desc = &fdctx.desc[fd];
+  desc->type = FdNone;
+}
+
+static void FdCreatePipe(ThreadState *thr, uptr pc, int rfd, int wfd) {
+  if (rfd >= FdContext::kMaxFds || rfd >= FdContext::kMaxFds) {
+    if (rfd < FdContext::kMaxFds) {
+      FdDesc *rdesc = &fdctx.desc[rfd];
+      rdesc->type = FdGlobal;
+    }
+    if (wfd < FdContext::kMaxFds) {
+      FdDesc *wdesc = &fdctx.desc[wfd];
+      wdesc->type = FdGlobal;
+    }
+  }
+  FdDesc *rdesc = &fdctx.desc[rfd];
+  rdesc->type = FdPipe;
+  void *raddr = FdAddr(rfd);
+  if (raddr) {
+    // To catch races between fd usage and close.
+    MemoryWrite1Byte(thr, pc, (uptr)raddr);
+  }
+  FdDesc *wdesc = &fdctx.desc[wfd];
+  wdesc->type = FdPipe;
+  void *waddr = FdAddr(wfd);
+  if (waddr) {
+    // To catch races between fd usage and close.
+    MemoryWrite1Byte(thr, pc, (uptr)waddr);
+  }
+}
+
 static uptr file2addr(char *path) {
   (void)path;
   static u64 addr;
@@ -1139,6 +1178,28 @@
   return res;
 }
 
+TSAN_INTERCEPTOR(int, close, int fd) {
+  SCOPED_TSAN_INTERCEPTOR(close, fd);
+  FdClose(thr, pc, fd);
+  return REAL(close)(fd);
+}
+
+TSAN_INTERCEPTOR(int, pipe, int pipefd[2]) {
+  SCOPED_TSAN_INTERCEPTOR(pipe, pipefd);
+  int res = REAL(pipe)(pipefd);
+  if (res == 0)
+    FdCreatePipe(thr, pc, pipefd[0], pipefd[1]);
+  return res;  
+}
+
+TSAN_INTERCEPTOR(int, pipe2, int pipefd[2], int flags) {
+  SCOPED_TSAN_INTERCEPTOR(pipe2, pipefd, flags);
+  int res = REAL(pipe2)(pipefd, flags);
+  if (res == 0)
+    FdCreatePipe(thr, pc, pipefd[0], pipefd[1]);
+  return res;
+}
+
 TSAN_INTERCEPTOR(long_t, read, int fd, void *buf, long_t sz) {
   SCOPED_TSAN_INTERCEPTOR(read, fd, buf, sz);
   int res = REAL(read)(fd, buf, sz);
@@ -1625,6 +1686,10 @@
   TSAN_INTERCEPT(sem_post);
   TSAN_INTERCEPT(sem_getvalue);
 
+  TSAN_INTERCEPT(close);
+  TSAN_INTERCEPT(pipe);
+  TSAN_INTERCEPT(pipe2);
+
   TSAN_INTERCEPT(read);
   TSAN_INTERCEPT(pread);
   TSAN_INTERCEPT(pread64);

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc?rev=169602&r1=169601&r2=169602&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_stat.cc Fri Dec  7 09:32:56 2012
@@ -181,6 +181,9 @@
   name[StatInt_sem_timedwait]            = "  sem_timedwait                   ";
   name[StatInt_sem_post]                 = "  sem_post                        ";
   name[StatInt_sem_getvalue]             = "  sem_getvalue                    ";
+  name[StatInt_close]                    = "  close                           ";
+  name[StatInt_pipe]                     = "  pipe                            ";
+  name[StatInt_pipe2]                    = "  pipe2                           ";
   name[StatInt_read]                     = "  read                            ";
   name[StatInt_pread]                    = "  pread                           ";
   name[StatInt_pread64]                  = "  pread64                         ";

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_stat.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_stat.h?rev=169602&r1=169601&r2=169602&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_stat.h (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_stat.h Fri Dec  7 09:32:56 2012
@@ -176,6 +176,9 @@
   StatInt_sem_timedwait,
   StatInt_sem_post,
   StatInt_sem_getvalue,
+  StatInt_close,
+  StatInt_pipe,
+  StatInt_pipe2,
   StatInt_read,
   StatInt_pread,
   StatInt_pread64,