diff options
| author | Marco Elver <elver@google.com> | 2020-06-15 05:13:42 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-06-15 09:56:18 +0200 |
| commit | 8e3ab94116d1518722c1b341ce88a81b957e90be (patch) | |
| tree | e0eee18c0c5a162b3a67a341ba7edb7ffde111d7 /executor | |
| parent | 2a22c77acf37f7d1907dda704aa5ca5ea28075ca (diff) | |
executor: Improve used terminology
Improve used terminology by using better verbs to express the effect of
the whitelist/blacklist.
This also changes executor to exclusively show respectful log messages,
and as per recent conversion, converts the last such case.
Diffstat (limited to 'executor')
| -rw-r--r-- | executor/common_linux.h | 9 | ||||
| -rw-r--r-- | executor/executor.cc | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/executor/common_linux.h b/executor/common_linux.h index e4793f421..c4b3f052f 100644 --- a/executor/common_linux.h +++ b/executor/common_linux.h @@ -3496,15 +3496,16 @@ static void setup_kcsan() } #if SYZ_EXECUTOR // currently only used by executor -static void setup_kcsan_filterlist(char** frames, int nframes, bool ignore) +static void setup_kcsan_filterlist(char** frames, int nframes, bool suppress) { int fd = open(KCSAN_DEBUGFS_FILE, O_WRONLY); if (fd == -1) fail("failed to open(\"%s\")", KCSAN_DEBUGFS_FILE); - const char* const filtertype = ignore ? "blacklist" : "whitelist"; - printf("adding functions to KCSAN %s: ", filtertype); - dprintf(fd, "%s\n", filtertype); + printf("%s KCSAN reports in functions: ", + suppress ? "suppressing" : "only showing"); + if (!suppress) + dprintf(fd, "whitelist\n"); for (int i = 0; i < nframes; ++i) { printf("'%s' ", frames[i]); dprintf(fd, "!%s\n", frames[i]); diff --git a/executor/executor.cc b/executor/executor.cc index bffd0cec2..ab8ae3d6c 100644 --- a/executor/executor.cc +++ b/executor/executor.cc @@ -346,7 +346,7 @@ int main(int argc, char** argv) } if (argc >= 2 && strcmp(argv[1], "setup_kcsan_filterlist") == 0) { #if SYZ_HAVE_KCSAN - setup_kcsan_filterlist(argv + 2, argc - 2, /*ignore=*/true); + setup_kcsan_filterlist(argv + 2, argc - 2, /*suppress=*/true); #else fail("KCSAN is not implemented"); #endif |