Update Crashpad to 54048cfd78af0a54cf4a2d2ecfb83881f5c54590

third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "handler/crash_report_upload_thread.h"
 
 #include <errno.h>
 #include <time.h>
 
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
-#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "client/settings.h"
 #include "snapshot/minidump/process_snapshot_minidump.h"
 #include "snapshot/module_snapshot.h"
 #include "util/file/file_reader.h"
 #include "util/misc/uuid.h"
 #include "util/net/http_body.h"
 #include "util/net/http_multipart_builder.h"
 #include "util/net/http_transport.h"
 #include "util/stdlib/map_insert.h"
-#include "util/thread/thread.h"
 
 namespace crashpad {
 
 namespace {
 
 void InsertOrReplaceMapEntry(std::map<std::string, std::string>* map,
                              const std::string& key,
                              const std::string& value) {
   std::string old_value;
   if (!MapInsertOrReplace(map, key, value, &old_value)) {
@@ skipping 83 matching lines @@
 
  private:
   CrashReportDatabase* database_;  // weak
   const CrashReportDatabase::Report* report_;  // weak
 
   DISALLOW_COPY_AND_ASSIGN(CallRecordUploadAttempt);
 };
 
 }  // namespace
 
-namespace internal {
-
-class CrashReportUploadHelperThread final : public Thread {
- public:
-  explicit CrashReportUploadHelperThread(CrashReportUploadThread* self)
-      : self_(self) {}
-  ~CrashReportUploadHelperThread() override {}
-
-  void ThreadMain() override {
-    self_->ThreadMain();
-  }
-
- private:
-  CrashReportUploadThread* self_;
-
-  DISALLOW_COPY_AND_ASSIGN(CrashReportUploadHelperThread);
-};
-
-}  // namespace internal
-
 CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database,
                                                  const std::string& url)
     : url_(url),
-      database_(database),
-      semaphore_(0),
-      thread_(),
-      running_(false) {
+      // Check for pending reports every 15 minutes, even in the absence of a
+      // signal from the handler thread. This allows for failed uploads to be
+      // retried periodically, and for pending reports written by other
+      // processes to be recognized.
+      thread_(15 * 60, this),
+      database_(database) {
 }
 
 CrashReportUploadThread::~CrashReportUploadThread() {
-  DCHECK(!running_);
-  DCHECK(!thread_);
 }
 
 void CrashReportUploadThread::Start() {
-  DCHECK(!running_);
-  DCHECK(!thread_);
-
-  running_ = true;
-  thread_.reset(new internal::CrashReportUploadHelperThread(this));
-  thread_->Start();
+  thread_.Start(0);
 }
 
 void CrashReportUploadThread::Stop() {
-  DCHECK(running_);
-  DCHECK(thread_);
-
-  if (!running_) {
-    return;
-  }
-
-  running_ = false;
-  semaphore_.Signal();
-
-  thread_->Join();
-  thread_.reset();
+  thread_.Stop();
 }
 
 void CrashReportUploadThread::ReportPending() {
-  semaphore_.Signal();
-}
-
-void CrashReportUploadThread::ThreadMain() {
-  while (running_) {
-    ProcessPendingReports();
-
-    // Check for pending reports every 15 minutes, even in the absence of a
-    // signal from the handler thread. This allows for failed uploads to be
-    // retried periodically, and for pending reports written by other processes
-    // to be recognized.
-    semaphore_.TimedWait(15 * 60);
-  }
+  thread_.DoWorkNow();
 }
 
 void CrashReportUploadThread::ProcessPendingReports() {
   std::vector<CrashReportDatabase::Report> reports;
   if (database_->GetPendingReports(&reports) != CrashReportDatabase::kNoError) {
     // The database is sick. It might be prudent to stop trying to poke it from
     // this thread by abandoning the thread altogether. On the other hand, if
     // the problem is transient, it might be possible to talk to it again on the
     // next pass. For now, take the latter approach.
     return;
   }
 
   for (const CrashReportDatabase::Report& report : reports) {
     ProcessPendingReport(report);
 
     // Respect Stop() being called after at least one attempt to process a
     // report.
-    if (!running_) {
+    if (!thread_.is_running()) {
       return;
     }
   }
 }
 
 void CrashReportUploadThread::ProcessPendingReport(
     const CrashReportDatabase::Report& report) {
   Settings* const settings = database_->GetSettings();
 
   bool uploads_enabled;
@@ skipping 130 matching lines @@
   // TODO(mark): The timeout should be configurable by the client.
   http_transport->SetTimeout(60.0);  // 1 minute.
 
   if (!http_transport->ExecuteSynchronously(response_body)) {
     return UploadResult::kRetry;
   }
 
   return UploadResult::kSuccess;
 }
 
+void CrashReportUploadThread::DoWork(const WorkerThread* thread) {
+  ProcessPendingReports();
+}
+
 }  // namespace crashpad