maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[sanitizer] Intercept sched_getaffinity." 

This reverts commit r187788.

The test case is unreliable (as the test may be run in a situation in
which it has no affinity with cpu0). This can be recommitted with a more
reliable test - possibly using CPU_COUNT != 0 instead (I wasn't entirely
sure that a process was guaranteed to have at least one affinity, though
it seems reasonable, or I'd have made the change myself).

llvm-svn: 187841
This commit is contained in:
David Blaikie 2013-08-07 00:37:26 +00:00
parent 0a0faa98d1
commit 787e2b6499
5 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler-rt/lib/msan/tests/msan_test.cc
View File

@ -2054,13 +2054,6 @@ TEST(MemorySanitizer, dlopenFailed) {
#endif // MSAN_TEST_DISABLE_DLOPEN
TEST(MemorySanitizer, sched_getaffinity) {
cpu_set_t mask;
int res = sched_getaffinity(getpid(), sizeof(mask), &mask);
ASSERT_EQ(0, res);
ASSERT_TRUE(CPU_ISSET(0, &mask));
}
TEST(MemorySanitizer, scanf) {
const char *input = "42 hello";
int* d = new int;

17
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
View File

@ -1762,20 +1762,6 @@ INTERCEPTOR(SIZE_T, confstr, int name, char *buf, SIZE_T len) {
#define INIT_CONFSTR
#endif
#if SANITIZER_INTERCEPT_SCHED_GETAFFINITY
INTERCEPTOR(int, sched_getaffinity, int pid, SIZE_T cpusetsize, void *mask) {
void *ctx;
COMMON_INTERCEPTOR_ENTER(ctx, sched_getaffinity, pid, cpusetsize, mask);
int res = REAL(sched_getaffinity)(pid, cpusetsize, mask);
if (mask && !res)
COMMON_INTERCEPTOR_WRITE_RANGE(ctx, mask, cpusetsize);
return res;
}
#define INIT_SCHED_GETAFFINITY INTERCEPT_FUNCTION(sched_getaffinity);
#else
#define INIT_SCHED_GETAFFINITY
#endif
#define SANITIZER_COMMON_INTERCEPTORS_INIT \
INIT_STRCMP; \
INIT_STRNCMP; \
@ -1835,5 +1821,4 @@ INTERCEPTOR(int, sched_getaffinity, int pid, SIZE_T cpusetsize, void *mask) {
INIT_TCGETATTR; \
INIT_REALPATH; \
INIT_CANONICALIZE_FILE_NAME; \
INIT_CONFSTR; \
INIT_SCHED_GETAFFINITY;
INIT_CONFSTR;

1
compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
View File

@ -110,6 +110,5 @@
# define SANITIZER_INTERCEPT_REALPATH SI_NOT_WINDOWS
# define SANITIZER_INTERCEPT_CANONICALIZE_FILE_NAME SI_LINUX_NOT_ANDROID
# define SANITIZER_INTERCEPT_CONFSTR SI_MAC || SI_LINUX_NOT_ANDROID
# define SANITIZER_INTERCEPT_SCHED_GETAFFINITY SI_LINUX_NOT_ANDROID
#endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H

1
compiler-rt/lib/tsan/rtl/tsan_stat.cc
View File

@ -353,7 +353,6 @@ void StatOutput(u64 *stat) {
name[StatInt_realpath] = " realpath ";
name[StatInt_canonicalize_file_name] = " canonicalize_file_name ";
name[StatInt_confstr] = " confstr ";
name[StatInt_sched_getaffinity] = " sched_getaffinity ";
name[StatAnnotation] = "Dynamic annotations ";
name[StatAnnotateHappensBefore] = " HappensBefore ";

1
compiler-rt/lib/tsan/rtl/tsan_stat.h
View File

@ -348,7 +348,6 @@ enum StatType {
StatInt_realpath,
StatInt_canonicalize_file_name,
StatInt_confstr,
StatInt_sched_getaffinity,
// Dynamic annotations.
StatAnnotation,