diff options
author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 23:10:46 +0000 |
---|---|---|
committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 23:10:46 +0000 |
commit | 60aac62ddf3cc40741a824cae25ab190005513be (patch) | |
tree | 0f55441604d8e4ee3693d0ce6b3e8e8d4dbe06cc /base | |
parent | da4e34b86c37f77dc7027fbc1fd599d319b69bd0 (diff) | |
download | chromium_src-60aac62ddf3cc40741a824cae25ab190005513be.zip chromium_src-60aac62ddf3cc40741a824cae25ab190005513be.tar.gz chromium_src-60aac62ddf3cc40741a824cae25ab190005513be.tar.bz2 |
Un-duplicate EvictFileFromSystemCache.
Change required for http://codereview.chromium.org/9639 .
Review URL: http://codereview.chromium.org/12407
Patch from Pawel Hajdan Jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/base.xcodeproj/project.pbxproj | 6 | ||||
-rw-r--r-- | base/build/base.vcproj | 8 | ||||
-rw-r--r-- | base/test_file_util.h | 29 | ||||
-rw-r--r-- | base/test_file_util_linux.cc | 28 | ||||
-rw-r--r-- | base/test_file_util_mac.cc | 17 | ||||
-rw-r--r-- | base/test_file_util_win.cc | 100 |
6 files changed, 188 insertions, 0 deletions
diff --git a/base/base.xcodeproj/project.pbxproj b/base/base.xcodeproj/project.pbxproj index 5709f3c..7769b15 100644 --- a/base/base.xcodeproj/project.pbxproj +++ b/base/base.xcodeproj/project.pbxproj @@ -134,6 +134,7 @@ 829E365F0DC0FB1C00819EBF /* stats_table.cc in Sources */ = {isa = PBXBuildFile; fileRef = 825403790D92D2CF0006B936 /* stats_table.cc */; }; 829E36730DC0FBAD00819EBF /* thread_local_storage_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 829E36720DC0FBAD00819EBF /* thread_local_storage_posix.cc */; }; 82D094550E5B892600FEC05C /* time_format.cc in Sources */ = {isa = PBXBuildFile; fileRef = 82D094540E5B892600FEC05C /* time_format.cc */; }; + 84B581DC0EDC715A00A6B5B3 /* test_file_util_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84B581950EDC6ECC00A6B5B3 /* test_file_util_mac.cc */; }; 9301C03B0E54C839001EF103 /* waitable_event_generic.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9301C0390E54C839001EF103 /* waitable_event_generic.cc */; }; 93611ADF0E5A7FC500F9405D /* message_pump_default.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93611ADC0E5A7FC500F9405D /* message_pump_default.cc */; }; 93611AE10E5A7FE200F9405D /* message_loop.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93611AE00E5A7FE200F9405D /* message_loop.cc */; }; @@ -581,6 +582,8 @@ 82D094530E5B892600FEC05C /* time_format.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time_format.h; sourceTree = "<group>"; }; 82D094540E5B892600FEC05C /* time_format.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time_format.cc; sourceTree = "<group>"; }; 82E23FCB0D9C219600F8B40A /* platform_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform_thread.h; sourceTree = "<group>"; }; + 84B581950EDC6ECC00A6B5B3 /* test_file_util_mac.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_file_util_mac.cc; sourceTree = "<group>"; }; + 84B5819B0EDC6FBC00A6B5B3 /* test_file_util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_file_util.h; sourceTree = "<group>"; }; 9301C0390E54C839001EF103 /* waitable_event_generic.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = waitable_event_generic.cc; sourceTree = "<group>"; }; 9301C03A0E54C839001EF103 /* waitable_event_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = waitable_event_unittest.cc; sourceTree = "<group>"; }; 93611ADA0E5A7FC500F9405D /* message_loop_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = message_loop_unittest.cc; sourceTree = "<group>"; }; @@ -1014,6 +1017,8 @@ E4CE9D770E8C1FCA00D5378C /* system_monitor.h */, E4CE9D760E8C1FCA00D5378C /* system_monitor_unittest.cc */, 8254037E0D92D2CF0006B936 /* task.h */, + 84B5819B0EDC6FBC00A6B5B3 /* test_file_util.h */, + 84B581950EDC6ECC00A6B5B3 /* test_file_util_mac.cc */, 93E703230E5D64F00046259B /* thread.cc */, 825403800D92D2CF0006B936 /* thread.h */, 7BAE38A80E6EFD9900C3F750 /* thread_local.h */, @@ -1411,6 +1416,7 @@ 7B6AF6340E80211C00F9F9CF /* sys_info_posix.cc in Sources */, 7B4C5F4A0E4B6BF900679E8F /* sys_string_conversions_mac.mm in Sources */, E4CE9D7A0E8C1FD400D5378C /* system_monitor.cc in Sources */, + 84B581DC0EDC715A00A6B5B3 /* test_file_util_mac.cc in Sources */, 93E703240E5D64F00046259B /* thread.cc in Sources */, 7BAE38AC0E6EFDBA00C3F750 /* thread_local_posix.cc in Sources */, 829E36730DC0FBAD00819EBF /* thread_local_storage_posix.cc in Sources */, diff --git a/base/build/base.vcproj b/base/build/base.vcproj index d580b80..16d3ba2 100644 --- a/base/build/base.vcproj +++ b/base/build/base.vcproj @@ -834,6 +834,14 @@ > </File> <File + RelativePath="..\test_file_util.cc" + > + </File> + <File + RelativePath="..\test_file_util.h" + > + </File> + <File RelativePath="..\thread.cc" > </File> diff --git a/base/test_file_util.h b/base/test_file_util.h new file mode 100644 index 0000000..3547d55 --- /dev/null +++ b/base/test_file_util.h @@ -0,0 +1,29 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef BASE_TEST_FILE_UTIL_H_ +#define BASE_TEST_FILE_UTIL_H_ + +// File utility functions used only by tests. + +#include <string> + +namespace file_util { + +// Clear a specific file from the system cache. 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. +// +// Returns true on success. False means there was some error copying, so the +// state of the destination is unknown. +bool CopyRecursiveDirNoCache(const std::wstring& source_dir, + const std::wstring& dest_dir); + +} // namespace file_util + +#endif // BASE_TEST_FILE_UTIL_H_ diff --git a/base/test_file_util_linux.cc b/base/test_file_util_linux.cc new file mode 100644 index 0000000..421d182 --- /dev/null +++ b/base/test_file_util_linux.cc @@ -0,0 +1,28 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/test_file_util.h" + +#include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "base/file_path.h" + +namespace file_util { + +bool EvictFileFromSystemCache(const wchar_t* file) { + FilePath fpath = FilePath::FromWStringHack(file); + int fd = open(fpath.value().c_str(), O_RDONLY); + if (fd < 0) + return false; + if (fdatasync(fd) != 0) + return false; + if (posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED) != 0) + return false; + close(fd); + return true; +} + +} // namespace file_util diff --git a/base/test_file_util_mac.cc b/base/test_file_util_mac.cc new file mode 100644 index 0000000..ebb13f3 --- /dev/null +++ b/base/test_file_util_mac.cc @@ -0,0 +1,17 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/test_file_util.h" + +#include "base/logging.h" + +namespace file_util { + +bool EvictFileFromSystemCache(const wchar_t* file) { + // TODO(port): Implement. + NOTIMPLEMENTED(); + return false; +} + +} // namespace file_util diff --git a/base/test_file_util_win.cc b/base/test_file_util_win.cc new file mode 100644 index 0000000..3973af6 --- /dev/null +++ b/base/test_file_util_win.cc @@ -0,0 +1,100 @@ +// Copyright (c) 2008 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "base/test_file_util.h" + +#include <windows.h> + +#include <vector> + +#include "base/file_util.h" + +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, + const std::wstring& dest_dir) { + // Try to create the directory if it doesn't already exist. + if (!CreateDirectory(dest_dir)) { + if (GetLastError() != ERROR_ALREADY_EXISTS) + return false; + } + + std::vector<std::wstring> files_copied; + + std::wstring src(source_dir); + file_util::AppendToPath(&src, L"*"); + + WIN32_FIND_DATA fd; + HANDLE fh = FindFirstFile(src.c_str(), &fd); + if (fh == INVALID_HANDLE_VALUE) + return false; + + do { + std::wstring cur_file(fd.cFileName); + if (cur_file == L"." || cur_file == L"..") + continue; // Skip these special entries. + + std::wstring cur_source_path(source_dir); + file_util::AppendToPath(&cur_source_path, cur_file); + + std::wstring cur_dest_path(dest_dir); + file_util::AppendToPath(&cur_dest_path, cur_file); + + if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + // Recursively copy a subdirectory. We stripped "." and ".." already. + if (!CopyRecursiveDirNoCache(cur_source_path, cur_dest_path)) { + FindClose(fh); + return false; + } + } else { + // Copy the file. + if (!::CopyFile(cur_source_path.c_str(), cur_dest_path.c_str(), false)) { + FindClose(fh); + return false; + } + + // We don't check for errors from this function, often, we are copying + // 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. + EvictFileFromSystemCache(cur_dest_path.c_str()); + } + } while (FindNextFile(fh, &fd)); + + FindClose(fh); + return true; +} + +} // namespace file_util + |