From 317f39290d36376c0b0f5d73a0e8f7c651ae3db5 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 9 Nov 2012 19:55:06 +0000 Subject: [PATCH] tsan: intercept gettimeofday() llvm-svn: 167630 --- compiler-rt/lib/tsan/rtl/tsan_interceptors.cc | 7 +++++++ compiler-rt/lib/tsan/rtl/tsan_stat.cc | 4 ++++ compiler-rt/lib/tsan/rtl/tsan_stat.h | 1 + 3 files changed, 12 insertions(+) diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc index 5151af4..e8aa7d5 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc @@ -1365,6 +1365,12 @@ static void process_pending_signals(ThreadState *thr) { thr->in_signal_handler = false; } +TSAN_INTERCEPTOR(int, gettimeofday, void *tv, void *tz) { + SCOPED_TSAN_INTERCEPTOR(gettimeofday, tv, tz); + // It's intercepted merely to process pending signals. + return REAL(gettimeofday)(tv, tz); +} + namespace __tsan { void InitializeInterceptors() { @@ -1492,6 +1498,7 @@ void InitializeInterceptors() { TSAN_INTERCEPT(sleep); TSAN_INTERCEPT(usleep); TSAN_INTERCEPT(nanosleep); + TSAN_INTERCEPT(gettimeofday); atexit_ctx = new(internal_alloc(MBlockAtExit, sizeof(AtExitContext))) AtExitContext(); diff --git a/compiler-rt/lib/tsan/rtl/tsan_stat.cc b/compiler-rt/lib/tsan/rtl/tsan_stat.cc index 1eb02a5..d8fbd0c 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_stat.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_stat.cc @@ -197,6 +197,10 @@ void StatOutput(u64 *stat) { name[StatInt_epoll_ctl] = " epoll_ctl "; name[StatInt_epoll_wait] = " epoll_wait "; name[StatInt_sigaction] = " sigaction "; + name[StatInt_sleep] = " sleep "; + name[StatInt_usleep] = " usleep "; + name[StatInt_nanosleep] = " nanosleep "; + name[StatInt_gettimeofday] = " gettimeofday "; name[StatAnnotation] = "Dynamic annotations "; name[StatAnnotateHappensBefore] = " HappensBefore "; diff --git a/compiler-rt/lib/tsan/rtl/tsan_stat.h b/compiler-rt/lib/tsan/rtl/tsan_stat.h index 16c43f1..3b81aca 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_stat.h +++ b/compiler-rt/lib/tsan/rtl/tsan_stat.h @@ -203,6 +203,7 @@ enum StatType { StatInt_sleep, StatInt_usleep, StatInt_nanosleep, + StatInt_gettimeofday, // Dynamic annotations. StatAnnotation, -- 2.7.4