Record UMA statistics for file_stream operations.

net/base/file_stream_posix.cc

 // Copyright (c) 2011 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.
 
 // For 64-bit file access (off_t = off64_t, lseek64, etc).
 #define _FILE_OFFSET_BITS 64
 
 #include "net/base/file_stream.h"
 
 #include <sys/types.h>
@@ skipping 44 matching lines @@
     case EACCES:
       return ERR_ACCESS_DENIED;
     default:
       LOG(WARNING) << "Unknown error " << err << " mapped to net::ERR_FAILED";
       return ERR_FAILED;
   }
 }
 
 // ReadFile() is a simple wrapper around read() that handles EINTR signals and
 // calls MapErrorCode() to map errno to net error codes.
-int ReadFile(base::PlatformFile file, char* buf, int buf_len) {
+int ReadFile(base::PlatformFile file, char* buf, int buf_len, int class_flags) {
   base::ThreadRestrictions::AssertIOAllowed();
   // read(..., 0) returns 0 to indicate end-of-file.
 
   // Loop in the case of getting interrupted by a signal.
   ssize_t res = HANDLE_EINTR(read(file, buf, static_cast<size_t>(buf_len)));
-  if (res == static_cast<ssize_t>(-1))
-    return MapErrorCode(errno);
+  if (res == static_cast<ssize_t>(-1)) {
+    int error = errno;
+    RecordFileError(error, FILE_ERROR_TYPES_READ, class_flags);
+    return MapErrorCode(error);
+  }
   return static_cast<int>(res);
 }
 
 void ReadFileTask(base::PlatformFile file,
                   char* buf,
                   int buf_len,
+                  int class_flags,
                   CompletionCallback* callback) {
-  callback->Run(ReadFile(file, buf, buf_len));
+  callback->Run(ReadFile(file, buf, buf_len, class_flags));
 }
 
 // WriteFile() is a simple wrapper around write() that handles EINTR signals and
 // calls MapErrorCode() to map errno to net error codes.  It tries to write to
 // completion.
-int WriteFile(base::PlatformFile file, const char* buf, int buf_len) {
+int WriteFile(base::PlatformFile file, const char* buf, int buf_len,
+              int class_flags) {
   base::ThreadRestrictions::AssertIOAllowed();
   ssize_t res = HANDLE_EINTR(write(file, buf, buf_len));
-  if (res == -1)
-    return MapErrorCode(errno);
+  if (res == -1) {
+    int error = errno;
+    RecordFileError(error, FILE_ERROR_TYPES_WRITE, class_flags);
+    return MapErrorCode(error);
+  }
   return res;
 }
 
 void WriteFileTask(base::PlatformFile file,
                    const char* buf,
-                   int buf_len,
+                   int buf_len, int class_flags,
                    CompletionCallback* callback) {
-  callback->Run(WriteFile(file, buf, buf_len));
+  callback->Run(WriteFile(file, buf, buf_len, class_flags));
 }
 
 // FlushFile() is a simple wrapper around fsync() that handles EINTR signals and
 // calls MapErrorCode() to map errno to net error codes.  It tries to flush to
 // completion.
-int FlushFile(base::PlatformFile file) {
+int FlushFile(base::PlatformFile file, int class_flags) {
   base::ThreadRestrictions::AssertIOAllowed();
   ssize_t res = HANDLE_EINTR(fsync(file));
-  if (res == -1)
-    return MapErrorCode(errno);
+  if (res == -1) {
+    int error = errno;
+    RecordFileError(error, FILE_ERROR_TYPES_FLUSH, class_flags);
+    return MapErrorCode(error);
+  }
   return res;
 }
 
 }  // namespace
 
 // CancelableCallbackTask takes ownership of the Callback.  This task gets
 // posted to the MessageLoopForIO instance.
 class CancelableCallbackTask : public CancelableTask {
  public:
   explicit CancelableCallbackTask(Callback0::Type* callback)
@@ skipping 15 matching lines @@
 
 // FileStream::AsyncContext ----------------------------------------------
 
 class FileStream::AsyncContext {
  public:
   AsyncContext();
   ~AsyncContext();
 
   // These methods post synchronous read() and write() calls to a WorkerThread.
   void InitiateAsyncRead(
-      base::PlatformFile file, char* buf, int buf_len,
+      base::PlatformFile file, char* buf, int buf_len, int class_flags,
       CompletionCallback* callback);
   void InitiateAsyncWrite(
-      base::PlatformFile file, const char* buf, int buf_len,
+      base::PlatformFile file, const char* buf, int buf_len, int class_flags,
       CompletionCallback* callback);
 
   CompletionCallback* callback() const { return callback_; }
 
   // Called by the WorkerPool thread executing the IO after the IO completes.
   // This method queues RunAsynchronousCallback() on the MessageLoop and signals
   // |background_io_completed_callback_|, in case the destructor is waiting.  In
   // that case, the destructor will call RunAsynchronousCallback() instead, and
   // cancel |message_loop_task_|.
   // |result| is the result of the Read/Write task.
@@ skipping 46 matching lines @@
     RunAsynchronousCallback();
     if (need_to_wait) {
       // We want to see if we block the message loop for too long.
       UMA_HISTOGRAM_TIMES("AsyncIO.FileStreamClose",
                           base::TimeTicks::Now() - start);
     }
   }
 }
 
 void FileStream::AsyncContext::InitiateAsyncRead(
-    base::PlatformFile file, char* buf, int buf_len,
+    base::PlatformFile file, char* buf, int buf_len, int class_flags,
     CompletionCallback* callback) {
   DCHECK(!callback_);
   callback_ = callback;
 
   base::WorkerPool::PostTask(FROM_HERE,
                              NewRunnableFunction(
                                  &ReadFileTask,
-                                 file, buf, buf_len,
+                                 file, buf, buf_len, class_flags,
                                  &background_io_completed_callback_),
                              true /* task_is_slow */);
 }
 
 void FileStream::AsyncContext::InitiateAsyncWrite(
-    base::PlatformFile file, const char* buf, int buf_len,
+    base::PlatformFile file, const char* buf, int buf_len, int class_flags,
     CompletionCallback* callback) {
   DCHECK(!callback_);
   callback_ = callback;
 
   base::WorkerPool::PostTask(FROM_HERE,
                              NewRunnableFunction(
                                  &WriteFileTask,
-                                 file, buf, buf_len,
+                                 file, buf, buf_len, class_flags,
                                  &background_io_completed_callback_),
                              true /* task_is_slow */);
 }
 
 void FileStream::AsyncContext::OnBackgroundIOCompleted(int result) {
   result_ = result;
   message_loop_task_ = new CancelableCallbackTask(
       NewCallback(this, &AsyncContext::RunAsynchronousCallback));
   message_loop_->PostTask(FROM_HERE, message_loop_task_);
   background_io_completed_.Signal();
@@ skipping 20 matching lines @@
   std::swap(temp, callback_);
   background_io_completed_.Reset();
   temp->Run(result_);
 }
 
 // FileStream ------------------------------------------------------------
 
 FileStream::FileStream()
     : file_(base::kInvalidPlatformFileValue),
       open_flags_(0),
       auto_closed_(true) {

[cbentzel, 2011/08/15 19:49:11]

class_flags_ needs to be initialized.

[ahendrickson, 2011/08/15 23:42:26]

Done.

   DCHECK(!IsOpen());
 }
 
+FileStream::FileStream(int class_flags)
+    : file_(base::kInvalidPlatformFileValue),
+      open_flags_(0),
+      auto_closed_(true),
+      class_flags_(class_flags) {
+  DCHECK(!IsOpen());
+}
+
 FileStream::FileStream(base::PlatformFile file, int flags)
     : file_(file),
       open_flags_(flags),
       auto_closed_(false) {

[cbentzel, 2011/08/15 19:49:11]

class_flags_ needs to be initialized.

[ahendrickson, 2011/08/15 23:42:26]

Done.

   // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to
   // make sure we will perform asynchronous File IO to it.
   if (flags & base::PLATFORM_FILE_ASYNC) {
     async_context_.reset(new AsyncContext());
   }
 }
 
+FileStream::FileStream(base::PlatformFile file, int flags, int class_flags)
+    : file_(file),
+      open_flags_(flags),
+      auto_closed_(false),
+      class_flags_(class_flags) {
+  // If the file handle is opened with base::PLATFORM_FILE_ASYNC, we need to
+  // make sure we will perform asynchronous File IO to it.
+  if (flags & base::PLATFORM_FILE_ASYNC) {
+    async_context_.reset(new AsyncContext());
+  }
+}
+
 FileStream::~FileStream() {
   if (auto_closed_)
     Close();
 }
 
 void FileStream::Close() {
   // Abort any existing asynchronous operations.
   async_context_.reset();
 
   if (file_ != base::kInvalidPlatformFileValue) {
     if (close(file_) != 0) {
       NOTREACHED();
     }
     file_ = base::kInvalidPlatformFileValue;
   }
 }
 
 int FileStream::Open(const FilePath& path, int open_flags) {
   if (IsOpen()) {
     DLOG(FATAL) << "File is already open!";
     return ERR_UNEXPECTED;
   }
 
   open_flags_ = open_flags;
   file_ = base::CreatePlatformFile(path, open_flags_, NULL, NULL);
   if (file_ == base::kInvalidPlatformFileValue) {
-    return MapErrorCode(errno);
+    int error = errno;
+    RecordFileError(error, FILE_ERROR_TYPES_OPEN, class_flags_);
+    return MapErrorCode(error);
   }
 
   if (open_flags_ & base::PLATFORM_FILE_ASYNC) {
     async_context_.reset(new AsyncContext());
   }
 
   return OK;
 }
 
 bool FileStream::IsOpen() const {
   return file_ != base::kInvalidPlatformFileValue;
 }
 
 int64 FileStream::Seek(Whence whence, int64 offset) {
   base::ThreadRestrictions::AssertIOAllowed();
 
-  if (!IsOpen())
+  if (!IsOpen()) {
+    RecordFileError(EINVAL, FILE_ERROR_TYPES_IS_NOT_OPEN, class_flags_);
     return ERR_UNEXPECTED;
+  }
 
   // If we're in async, make sure we don't have a request in flight.
   DCHECK(!async_context_.get() || !async_context_->callback());
 
   off_t res = lseek(file_, static_cast<off_t>(offset),
                     static_cast<int>(whence));
-  if (res == static_cast<off_t>(-1))
-    return MapErrorCode(errno);
+  if (res == static_cast<off_t>(-1)) {
+    int error = errno;
+    RecordFileError(error, FILE_ERROR_TYPES_SEEK, class_flags_);
+    return MapErrorCode(error);
+  }
 
   return res;
 }
 
 int64 FileStream::Available() {
   base::ThreadRestrictions::AssertIOAllowed();
 
-  if (!IsOpen())
+  if (!IsOpen()) {
+    RecordFileError(EINVAL, FILE_ERROR_TYPES_IS_NOT_OPEN, class_flags_);
     return ERR_UNEXPECTED;
+  }
 
   int64 cur_pos = Seek(FROM_CURRENT, 0);
   if (cur_pos < 0)
     return cur_pos;
 
   struct stat info;
-  if (fstat(file_, &info) != 0)
-    return MapErrorCode(errno);
-
+  if (fstat(file_, &info) != 0) {
+    int error = errno;
+    RecordFileError(error, FILE_ERROR_TYPES_GET_SIZE, class_flags_);
+    return MapErrorCode(error);
+  }
   int64 size = static_cast<int64>(info.st_size);
   DCHECK_GT(size, cur_pos);
 
   return size - cur_pos;
 }
 
 int FileStream::Read(
     char* buf, int buf_len, CompletionCallback* callback) {
-  if (!IsOpen())
+  if (!IsOpen()) {
+    RecordFileError(EINVAL, FILE_ERROR_TYPES_IS_NOT_OPEN, class_flags_);
     return ERR_UNEXPECTED;
+  }
 
   // read(..., 0) will return 0, which indicates end-of-file.
   DCHECK(buf_len > 0);
   DCHECK(open_flags_ & base::PLATFORM_FILE_READ);
 
   if (async_context_.get()) {
     DCHECK(open_flags_ & base::PLATFORM_FILE_ASYNC);
     // If we're in async, make sure we don't have a request in flight.
     DCHECK(!async_context_->callback());
-    async_context_->InitiateAsyncRead(file_, buf, buf_len, callback);
+    async_context_->InitiateAsyncRead(file_, buf, buf_len, class_flags_,
+                                      callback);
     return ERR_IO_PENDING;
   } else {
-    return ReadFile(file_, buf, buf_len);
+    return ReadFile(file_, buf, buf_len, class_flags_);
   }
 }
 
 int FileStream::ReadUntilComplete(char *buf, int buf_len) {
   int to_read = buf_len;
   int bytes_total = 0;
 
   do {
     int bytes_read = Read(buf, to_read, NULL);
     if (bytes_read <= 0) {
       if (bytes_total == 0)
         return bytes_read;
 
       return bytes_total;
     }
 
     bytes_total += bytes_read;
     buf += bytes_read;
     to_read -= bytes_read;
   } while (bytes_total < buf_len);
 
   return bytes_total;
 }
 
 int FileStream::Write(
     const char* buf, int buf_len, CompletionCallback* callback) {
   // write(..., 0) will return 0, which indicates end-of-file.
   DCHECK_GT(buf_len, 0);
 
-  if (!IsOpen())
+  if (!IsOpen()) {
+    RecordFileError(EINVAL, FILE_ERROR_TYPES_IS_NOT_OPEN, class_flags_);
     return ERR_UNEXPECTED;
+  }
 
   if (async_context_.get()) {
     DCHECK(open_flags_ & base::PLATFORM_FILE_ASYNC);
     // If we're in async, make sure we don't have a request in flight.
     DCHECK(!async_context_->callback());
-    async_context_->InitiateAsyncWrite(file_, buf, buf_len, callback);
+    async_context_->InitiateAsyncWrite(file_, buf, buf_len, class_flags_,
+                                       callback);
     return ERR_IO_PENDING;
   } else {
-    return WriteFile(file_, buf, buf_len);
+    return WriteFile(file_, buf, buf_len, class_flags_);
   }
 }
 
 int64 FileStream::Truncate(int64 bytes) {
   base::ThreadRestrictions::AssertIOAllowed();
 
-  if (!IsOpen())
+  if (!IsOpen()) {
+    RecordFileError(EINVAL, FILE_ERROR_TYPES_IS_NOT_OPEN, class_flags_);
     return ERR_UNEXPECTED;
+  }
 
   // We better be open for reading.
   DCHECK(open_flags_ & base::PLATFORM_FILE_WRITE);
 
   // Seek to the position to truncate from.
   int64 seek_position = Seek(FROM_BEGIN, bytes);
   if (seek_position != bytes)
     return ERR_UNEXPECTED;
 
   // And truncate the file.
   int result = ftruncate(file_, bytes);
-  return result == 0 ? seek_position : MapErrorCode(errno);
+  if (result == 0)
+    return seek_position;
+
+  int error = errno;
+  RecordFileError(error, FILE_ERROR_TYPES_SET_EOF, class_flags_);
+  return MapErrorCode(error);
 }
 
 int FileStream::Flush() {
-  if (!IsOpen())
+  if (!IsOpen()) {
+    RecordFileError(EINVAL, FILE_ERROR_TYPES_IS_NOT_OPEN, class_flags_);
     return ERR_UNEXPECTED;
+  }
 
-  return FlushFile(file_);
+  return FlushFile(file_, class_flags_);
+}
+
+void FileStream::EnableRecording(bool enable, int class_flags) {
+  if (enable)
+    class_flags_ |= class_flags;
+  else
+    class_flags_ &= ~class_flags;
 }
 
 }  // namespace net