Improved error checking for file errors in RtcEventLog.

webrtc/call/rtc_event_log_helper_thread.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 125 matching lines @@
 
   // Serialize the events in the event queue.
   while (!history_.empty() && !stop) {
     stop = AppendEventToString(history_.front().get());
     if (!stop) {
       history_.pop_front();
     }
   }
 
   // Write to file.
-  file_->Write(output_string_.data(), output_string_.size());
+  bool success = file_->Write(output_string_.data(), output_string_.size());
+  if (!success) {
+    LOG(LS_WARNING) << "FileWrapper failed to write WebRtcEventLog file.";

[pbos-webrtc, 2016/05/23 11:59:11]

LS_ERROR

+    // The current FileWrapper implementation closes the file on error.
+    RTC_DCHECK(!file_->Open());
+    return;
+  }
   written_bytes_ += output_string_.size();
 
   // Free the allocated memory since we probably won't need this amount of
   // space again.
   output_string_.clear();
   output_string_.shrink_to_fit();
 
   if (stop) {
     RTC_DCHECK(file_->Open());
     StopLogFile();
@@ skipping 17 matching lines @@
     stop = AppendEventToString(most_recent_event_.get());
     if (!stop) {
       if (IsConfigEvent(*most_recent_event_)) {
         config_history_.push_back(std::move(most_recent_event_));
       }
       has_recent_event_ = event_queue_->Remove(&most_recent_event_);
     }
   }
 
   // Write string to file.
-  file_->Write(output_string_.data(), output_string_.size());
+  bool success = file_->Write(output_string_.data(), output_string_.size());

[pbos-webrtc, 2016/05/23 11:59:11]

remove temporary bool

+  if (!success) {
+    LOG(LS_WARNING) << "FileWrapper failed to write WebRtcEventLog file.";

[pbos-webrtc, 2016/05/23 11:59:11]

LS_ERROR

+    // The current FileWrapper implementation closes the file on error.
+    RTC_DCHECK(!file_->Open());
+    return;
+  }
   written_bytes_ += output_string_.size();
 
-  if (!file_->Open()) {
-    LOG(LS_WARNING) << "WebRTC event log file closed by FileWrapper.";
-  }
-
   // We want to stop logging if we have reached the file size limit. We also
   // want to stop logging if the remaining events are more recent than the
   // time limit, or in other words if we have terminated the loop despite
   // having more events in the queue.
   if ((has_recent_event_ && most_recent_event_->timestamp_us() > stop_time_) ||
       stop) {
     RTC_DCHECK(file_->Open());
     StopLogFile();
   }
 }
 
 void RtcEventLogHelperThread::StopLogFile() {
   RTC_DCHECK(file_->Open());
   output_string_.clear();
 
   rtclog::Event end_event;
   end_event.set_timestamp_us(stop_time_);
   end_event.set_type(rtclog::Event::LOG_END);
   AppendEventToString(&end_event);
 
   if (written_bytes_ + static_cast<int64_t>(output_string_.size()) <=
       max_size_bytes_) {
-    file_->Write(output_string_.data(), output_string_.size());
+    bool success = file_->Write(output_string_.data(), output_string_.size());

[pbos-webrtc, 2016/05/23 11:59:11]

remove bool here and everywhere it's not used after the if()

+    if (!success) {
+      LOG(LS_WARNING) << "FileWrapper failed to write WebRtcEventLog file.";

[pbos-webrtc, 2016/05/23 11:59:11]

LS_ERROR

+      // The current FileWrapper implementation closes the file on error.
+      RTC_DCHECK(!file_->Open());
+    }
     written_bytes_ += output_string_.size();
   }
 
   max_size_bytes_ = std::numeric_limits<int64_t>::max();
   written_bytes_ = 0;
   start_time_ = 0;
   stop_time_ = std::numeric_limits<int64_t>::max();
   output_string_.clear();
   file_->CloseFile();
   RTC_DCHECK(!file_->Open());
@@ skipping 52 matching lines @@
 
 bool RtcEventLogHelperThread::ThreadOutputFunction(void* obj) {
   RtcEventLogHelperThread* helper = static_cast<RtcEventLogHelperThread*>(obj);
   helper->WriteLog();
   return false;
 }
 
 }  // namespace webrtc
 
 #endif  // ENABLE_RTC_EVENT_LOG