diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 2 | ||||
| -rw-r--r-- | chrome/test/test_file_util.cc | 30 | ||||
| -rw-r--r-- | chrome/test/test_file_util.h | 11 | ||||
| -rw-r--r-- | chrome/tools/perf/flush_cache/SConscript | 30 | ||||
| -rw-r--r-- | chrome/tools/perf/flush_cache/flush_cache.cc | 11 |
5 files changed, 55 insertions, 29 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 16e9d5d..d691dd9 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -391,7 +391,6 @@ if env_flat['PLATFORM'] == 'win32': sconscript_files = [ 'test/chrome_plugin/SConscript', - 'tools/perf/flush_cache/SConscript', 'tools/test/image_diff/SConscript', 'third_party/hunspell/SConscript', '$THIRD_PARTY_DIR/sqlite/SConscript', @@ -418,6 +417,7 @@ if env['PLATFORM'] == 'win32': 'test/startup/SConscript', 'test/tab_switching/SConscript', 'tools/crash_service/SConscript', + 'tools/perf/flush_cache/SConscript', 'views/SConscript', ]) diff --git a/chrome/test/test_file_util.cc b/chrome/test/test_file_util.cc index 633fdc9..5bb55cc 100644 --- a/chrome/test/test_file_util.cc +++ b/chrome/test/test_file_util.cc @@ -12,6 +12,34 @@ namespace file_util { +bool EvictFileFromSystemCache(const wchar_t* file) { + // Request exclusive access to the file and overwrite it with no buffering. + win_util::ScopedHandle hfile( + CreateFile(file, GENERIC_READ | GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_FLAG_NO_BUFFERING, + NULL)); + if (!hfile) + return false; + + // Execute in chunks. It could be optimized. We want to do few of these since + // these opterations will be slow without the cache. + char buffer[4096]; + int total_bytes = 0; + DWORD bytes_read; + for (;;) { + bytes_read = 0; + ReadFile(hfile, buffer, sizeof(buffer), &bytes_read, NULL); + if (bytes_read == 0) + break; + + SetFilePointer(hfile, total_bytes, 0, FILE_BEGIN); + if (!WriteFile(hfile, buffer, bytes_read, &bytes_read, NULL)) + return false; + total_bytes += bytes_read; + } + return true; +} + // Like CopyFileNoCache but recursively copies all files and subdirectories // in the given input directory to the output directory. bool CopyRecursiveDirNoCache(const std::wstring& source_dir, @@ -60,7 +88,7 @@ bool CopyRecursiveDirNoCache(const std::wstring& source_dir, // files that are in the repository, and they will have read-only set. // This will prevent us from evicting from the cache, but these don't // matter anyway. - file_util::EvictFileFromSystemCache(cur_dest_path.c_str()); + EvictFileFromSystemCache(cur_dest_path.c_str()); } } while (FindNextFile(fh, &fd)); diff --git a/chrome/test/test_file_util.h b/chrome/test/test_file_util.h index bf415a1..dd4e34f 100644 --- a/chrome/test/test_file_util.h +++ b/chrome/test/test_file_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_TEST_TEST_FILE_UTIL_H_ -#define CHROME_TEST_TEST_FILE_UTIL_H_ +#ifndef CHROME_TEST_TEST_FILE_UTIL_H__ +#define CHROME_TEST_TEST_FILE_UTIL_H__ // File utility functions used only by tests. @@ -11,6 +11,11 @@ namespace file_util { +// Clear a specific file from the system cache using a neat trick. After this +// call, trying to access this file will result in a cold load from the hard +// drive. +bool EvictFileFromSystemCache(const wchar_t* file); + // Like CopyFileNoCache but recursively copies all files and subdirectories // in the given input directory to the output directory. Any files in the // destination that already exist will be overwritten. @@ -22,5 +27,5 @@ bool CopyRecursiveDirNoCache(const std::wstring& source_dir, } // namespace file_util -#endif // CHROME_TEST_TEST_FILE_UTIL_H_ +#endif // CHROME_TEST_TEST_FILE_UTIL_H__ diff --git a/chrome/tools/perf/flush_cache/SConscript b/chrome/tools/perf/flush_cache/SConscript index cd1cacf..a33cb3c 100644 --- a/chrome/tools/perf/flush_cache/SConscript +++ b/chrome/tools/perf/flush_cache/SConscript @@ -16,26 +16,26 @@ env_test.Prepend( ], ) -if env_test['PLATFORM'] == 'win32': - env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', +env_test.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', - '/MACHINE:X86', - '/FIXED:No', + '/MACHINE:X86', + '/FIXED:No', - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - ) + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], +) input_files = [ + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', 'flush_cache.cc', ] diff --git a/chrome/tools/perf/flush_cache/flush_cache.cc b/chrome/tools/perf/flush_cache/flush_cache.cc index f029028..f10b69b 100644 --- a/chrome/tools/perf/flush_cache/flush_cache.cc +++ b/chrome/tools/perf/flush_cache/flush_cache.cc @@ -5,13 +5,10 @@ // This little program attempts to flush the disk cache for some files. // It's useful for testing Chrome with a cold database. -#include "build/build_config.h" - -#include "base/file_path.h" -#include "base/file_util.h" #include "base/string_piece.h" #include "base/process_util.h" #include "base/sys_string_conversions.h" +#include "chrome/test/test_file_util.h" int main(int argc, const char* argv[]) { process_util::EnableTerminationOnHeapCorruption(); @@ -22,12 +19,8 @@ int main(int argc, const char* argv[]) { } for (int i = 1; i < argc; ++i) { -#if defined(OS_POSIX) - std::string filename(argv[i]); -#elif defined(OS_WIN) std::wstring filename = base::SysNativeMBToWide(argv[i]); -#endif - if (!file_util::EvictFileFromSystemCache(FilePath(filename))) { + if (!file_util::EvictFileFromSystemCache(filename.c_str())) { fprintf(stderr, "Failed to evict %s from cache -- is it a directory?\n", argv[i]); } |