Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7479)

Unified Diff: base/test/test_file_util_mac.cc

Issue 7484052: Return true when file size is zero. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Change comment to make it clear evicting an empty file will result in error Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/test_file_util_mac.cc
diff --git a/base/test/test_file_util_mac.cc b/base/test/test_file_util_mac.cc
index 316b5c3d01aa9aec7c42d64bce64be95cd0b0969..5b331b8c5e703c93cc6675e1660062ecf408d598 100644
--- a/base/test/test_file_util_mac.cc
+++ b/base/test/test_file_util_mac.cc
@@ -17,6 +17,17 @@ bool EvictFileFromSystemCache(const FilePath& file) {
// default) + MAP_SHARED, then do an msync to invalidate the memory. The next
// open should then have to load the file from disk.
+ int64 length;
+ if (!file_util::GetFileSize(file, &length)) {
+ DLOG(WARNING) << "failed to get size of " << file.value();
Paweł Hajdan Jr. 2011/07/30 00:05:09 LOG(ERROR) here please.
Huyen 2011/08/02 22:02:28 Done.
+ return false;
+ }
+
+ // When a file is empty, we do not need to evict it from cache.
+ // In fact, an attempt to map it to memory will result in error.
+ if (!length)
Paweł Hajdan Jr. 2011/07/30 00:05:09 LOG(WARNING) here please.
Paweł Hajdan Jr. 2011/07/30 00:05:09 Please explicitly compare with 0 instead of an imp
Huyen 2011/08/02 22:02:28 Done.
Huyen 2011/08/02 22:02:28 Done.
+ return true;
+
file_util::MemoryMappedFile mapped_file;
if (!mapped_file.Initialize(file)) {
DLOG(WARNING) << "failed to memory map " << file.value();
Paweł Hajdan Jr. 2011/07/30 00:05:09 Oh, and also change those DLOG -> LOG.
Huyen 2011/08/02 22:02:28 Done.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698