summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 02:39:03 +0000
committerzmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 02:39:03 +0000
commit49ec031c22cdccd490e5ea328c2c01a98e793e21 (patch)
tree6995a795f122aa0abc6d71befb21149ed9232877 /base
parentc27ded48173d1cee6bed4e1f82d29852607cd9e9 (diff)
downloadchromium_src-49ec031c22cdccd490e5ea328c2c01a98e793e21.zip
chromium_src-49ec031c22cdccd490e5ea328c2c01a98e793e21.tar.gz
chromium_src-49ec031c22cdccd490e5ea328c2c01a98e793e21.tar.bz2
Revert 257577 "Revert 257562 "Base: Make base::File use ScopedFD..."
Reland this: turns out not responsible. > Revert 257562 "Base: Make base::File use ScopedFD on POSIX." > > Might caused a bunch of layout test failures, at least on Linux > > fast/dom/Window/property-access-on-cached-properties-after-frame-navigated.html, > fast/dom/Window/property-access-on-cached-properties-after-frame-removed.html, > fast/dom/Window/property-access-on-cached-window-after-frame-navigated.html, > fast/dom/Window/property-access-on-cached-window-after-frame-removed.html > > > Base: Make base::File use ScopedFD on POSIX. > > > > Now that ScopedFD lives outside of file_util, File can use it to remove manual > > lifetime management. > > > > This also standarizes the behavior on Close failures for all platforms. > > > > BUG=none > > > > Review URL: https://codereview.chromium.org/201083002 > > TBR=rvargas@chromium.org > > Review URL: https://codereview.chromium.org/202583005 TBR=zmo@chromium.org Review URL: https://codereview.chromium.org/202493007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/files/file.cc4
-rw-r--r--base/files/file.h5
-rw-r--r--base/files/file_posix.cc54
-rw-r--r--base/files/file_win.cc5
4 files changed, 39 insertions, 29 deletions
diff --git a/base/files/file.cc b/base/files/file.cc
index 478f902..cd167b1 100644
--- a/base/files/file.cc
+++ b/base/files/file.cc
@@ -40,6 +40,9 @@ File::File(PlatformFile platform_file)
error_details_(FILE_OK),
created_(false),
async_(false) {
+#if defined(OS_POSIX)
+ DCHECK_GE(platform_file, -1);
+#endif
}
File::File(RValue other)
@@ -50,7 +53,6 @@ File::File(RValue other)
}
File::~File() {
- Close();
}
File& File::operator=(RValue other) {
diff --git a/base/files/file.h b/base/files/file.h
index f6ca8f8..9c2479d 100644
--- a/base/files/file.h
+++ b/base/files/file.h
@@ -12,6 +12,7 @@
#include "base/base_export.h"
#include "base/basictypes.h"
+#include "base/files/scoped_file.h"
#include "base/move.h"
#include "base/time/time.h"
@@ -177,7 +178,7 @@ class BASE_EXPORT File {
// return;
Error error_details() const { return error_details_; }
- PlatformFile GetPlatformFile() const { return file_; }
+ PlatformFile GetPlatformFile() const;
PlatformFile TakePlatformFile();
// Destroying this object closes the file automatically.
@@ -276,7 +277,7 @@ class BASE_EXPORT File {
#if defined(OS_WIN)
win::ScopedHandle file_;
#elif defined(OS_POSIX)
- PlatformFile file_;
+ ScopedFD file_;
#endif
Error error_details_;
diff --git a/base/files/file_posix.cc b/base/files/file_posix.cc
index a62ad98..f62491d 100644
--- a/base/files/file_posix.cc
+++ b/base/files/file_posix.cc
@@ -202,18 +202,20 @@ void File::InitializeUnsafe(const FilePath& name, uint32 flags) {
else
error_details_ = File::OSErrorToFileError(errno);
- file_ = descriptor;
+ file_.reset(descriptor);
}
#endif // !defined(OS_NACL)
bool File::IsValid() const {
- return file_ >= 0;
+ return file_.is_valid();
+}
+
+PlatformFile File::GetPlatformFile() const {
+ return file_.get();
}
PlatformFile File::TakePlatformFile() {
- PlatformFile file = file_;
- file_ = kInvalidPlatformFileValue;
- return file;
+ return file_.release();
}
void File::Close() {
@@ -221,17 +223,17 @@ void File::Close() {
return;
base::ThreadRestrictions::AssertIOAllowed();
- if (!IGNORE_EINTR(close(file_)))
- file_ = kInvalidPlatformFileValue;
+ file_.reset();
}
int64 File::Seek(Whence whence, int64 offset) {
base::ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
- if (file_ < 0 || offset < 0)
+ if (offset < 0)
return -1;
- return lseek(file_, static_cast<off_t>(offset), static_cast<int>(whence));
+ return lseek(file_.get(), static_cast<off_t>(offset),
+ static_cast<int>(whence));
}
int File::Read(int64 offset, char* data, int size) {
@@ -243,7 +245,7 @@ int File::Read(int64 offset, char* data, int size) {
int bytes_read = 0;
int rv;
do {
- rv = HANDLE_EINTR(pread(file_, data + bytes_read,
+ rv = HANDLE_EINTR(pread(file_.get(), data + bytes_read,
size - bytes_read, offset + bytes_read));
if (rv <= 0)
break;
@@ -263,7 +265,7 @@ int File::ReadAtCurrentPos(char* data, int size) {
int bytes_read = 0;
int rv;
do {
- rv = HANDLE_EINTR(read(file_, data, size));
+ rv = HANDLE_EINTR(read(file_.get(), data, size));
if (rv <= 0)
break;
@@ -277,7 +279,7 @@ int File::ReadNoBestEffort(int64 offset, char* data, int size) {
base::ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
- return HANDLE_EINTR(pread(file_, data, size, offset));
+ return HANDLE_EINTR(pread(file_.get(), data, size, offset));
}
int File::ReadAtCurrentPosNoBestEffort(char* data, int size) {
@@ -286,13 +288,13 @@ int File::ReadAtCurrentPosNoBestEffort(char* data, int size) {
if (size < 0)
return -1;
- return HANDLE_EINTR(read(file_, data, size));
+ return HANDLE_EINTR(read(file_.get(), data, size));
}
int File::Write(int64 offset, const char* data, int size) {
base::ThreadRestrictions::AssertIOAllowed();
- if (IsOpenAppend(file_))
+ if (IsOpenAppend(file_.get()))
return WriteAtCurrentPos(data, size);
DCHECK(IsValid());
@@ -302,7 +304,7 @@ int File::Write(int64 offset, const char* data, int size) {
int bytes_written = 0;
int rv;
do {
- rv = HANDLE_EINTR(pwrite(file_, data + bytes_written,
+ rv = HANDLE_EINTR(pwrite(file_.get(), data + bytes_written,
size - bytes_written, offset + bytes_written));
if (rv <= 0)
break;
@@ -322,7 +324,7 @@ int File::WriteAtCurrentPos(const char* data, int size) {
int bytes_written = 0;
int rv;
do {
- rv = HANDLE_EINTR(write(file_, data, size));
+ rv = HANDLE_EINTR(write(file_.get(), data, size));
if (rv <= 0)
break;
@@ -338,14 +340,14 @@ int File::WriteAtCurrentPosNoBestEffort(const char* data, int size) {
if (size < 0)
return -1;
- return HANDLE_EINTR(write(file_, data, size));
+ return HANDLE_EINTR(write(file_.get(), data, size));
}
int64 File::GetLength() {
DCHECK(IsValid());
stat_wrapper_t file_info;
- if (CallFstat(file_, &file_info))
+ if (CallFstat(file_.get(), &file_info))
return false;
return file_info.st_size;
@@ -354,13 +356,13 @@ int64 File::GetLength() {
bool File::SetLength(int64 length) {
base::ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
- return !CallFtruncate(file_, length);
+ return !CallFtruncate(file_.get(), length);
}
bool File::Flush() {
base::ThreadRestrictions::AssertIOAllowed();
DCHECK(IsValid());
- return !CallFsync(file_);
+ return !CallFsync(file_.get());
}
bool File::SetTimes(Time last_access_time, Time last_modified_time) {
@@ -371,14 +373,14 @@ bool File::SetTimes(Time last_access_time, Time last_modified_time) {
times[0] = last_access_time.ToTimeVal();
times[1] = last_modified_time.ToTimeVal();
- return !CallFutimes(file_, times);
+ return !CallFutimes(file_.get(), times);
}
bool File::GetInfo(Info* info) {
DCHECK(IsValid());
stat_wrapper_t file_info;
- if (CallFstat(file_, &file_info))
+ if (CallFstat(file_.get(), &file_info))
return false;
info->is_directory = S_ISDIR(file_info.st_mode);
@@ -432,11 +434,11 @@ bool File::GetInfo(Info* info) {
}
File::Error File::Lock() {
- return CallFctnlFlock(file_, true);
+ return CallFctnlFlock(file_.get(), true);
}
File::Error File::Unlock() {
- return CallFctnlFlock(file_, false);
+ return CallFctnlFlock(file_.get(), false);
}
// Static.
@@ -473,8 +475,8 @@ File::Error File::OSErrorToFileError(int saved_errno) {
}
void File::SetPlatformFile(PlatformFile file) {
- DCHECK_EQ(file_, kInvalidPlatformFileValue);
- file_ = file;
+ DCHECK(!file_.is_valid());
+ file_.reset(file);
}
} // namespace base
diff --git a/base/files/file_win.cc b/base/files/file_win.cc
index 2bd69c7..1e13381 100644
--- a/base/files/file_win.cc
+++ b/base/files/file_win.cc
@@ -99,6 +99,11 @@ void File::InitializeUnsafe(const FilePath& name, uint32 flags) {
bool File::IsValid() const {
return file_.IsValid();
}
+
+PlatformFile File::GetPlatformFile() const {
+ return file_;
+}
+
PlatformFile File::TakePlatformFile() {
return file_.Take();
}
generated by cgit v1.1 at 2025-04-03 00:49:32 +0000