Port CrashReportUploadThread to Windows

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/mac/crash_report_upload_thread.h"
+#include "handler/crash_report_upload_thread.h"
 
 #include <errno.h>
 #include <time.h>
 
 #include <map>
 #include <vector>
 
 #include "base/logging.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
 
+class HelperThread : public Thread {

[Mark Mentovai, 2015/08/18 21:38:11]

final (useful as a hint since this isn’t used outside of this translation unit,
but the compiler doesn’t know that.)

[scottmg, 2015/08/18 22:21:40]

Done.

+ public:
+  HelperThread(CrashReportUploadThread* self) : self_(self) {}

[Mark Mentovai, 2015/08/18 21:38:12]

explicit

[scottmg, 2015/08/18 22:21:40]

Done.

+  ~HelperThread() override {}
+
+  virtual void ThreadMain() {
+    self_->ThreadMain();
+  }
+
+ private:
+  CrashReportUploadThread* self_;
+};

[Mark Mentovai, 2015/08/18 21:38:11]

DISALLOW_COPY_AND_ASSIGN

[scottmg, 2015/08/18 22:21:40]

Done.

+
 CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database,
                                                  const std::string& url)
     : url_(url),
       database_(database),
       semaphore_(0),
-      thread_(0),
+      thread_(),
       running_(false) {
 }
 
 CrashReportUploadThread::~CrashReportUploadThread() {
   DCHECK(!running_);
   DCHECK(!thread_);
 }
 
 void CrashReportUploadThread::Start() {
   DCHECK(!running_);
   DCHECK(!thread_);
 
   running_ = true;
-  if ((errno = pthread_create(&thread_, nullptr, RunThreadMain, this)) != 0) {
-    PLOG(ERROR) << "pthread_create";
-    DCHECK(false);
-    running_ = false;
-  }
+  thread_.reset(new HelperThread(this));
 }
 
 void CrashReportUploadThread::Stop() {
   DCHECK(running_);
   DCHECK(thread_);
 
   if (!running_) {
     return;
   }
 
   running_ = false;
   semaphore_.Signal();
 
-  if ((errno = pthread_join(thread_, nullptr)) != 0) {
-    PLOG(ERROR) << "pthread_join";
-    DCHECK(false);
-  }
-
-  thread_ = 0;
+  thread_->Join();
+  thread_.reset();
 }
 
 void CrashReportUploadThread::ReportPending() {
   semaphore_.Signal();
 }
 
 void CrashReportUploadThread::ThreadMain() {
   while (running_) {
     ProcessPendingReports();
 
@@ skipping 138 matching lines @@
 
   for (const auto& kv : parameters) {
     if (kv.first == kMinidumpKey) {
       LOG(WARNING) << "reserved key " << kv.first << ", discarding value "
                    << kv.second;
     } else {
       http_multipart_builder.SetFormData(kv.first, kv.second);
     }
   }
 
-  http_multipart_builder.SetFileAttachment(kMinidumpKey,
-                                           report->file_path.BaseName().value(),
-                                           report->file_path,
-                                           "application/octet-stream");
+  http_multipart_builder.SetFileAttachment(
+      kMinidumpKey,
+#if defined(OS_WIN)
+      base::UTF16ToUTF8(report->file_path.BaseName().value()),
+#else
+      report->file_path.BaseName().value(),
+#endif
+      report->file_path,
+      "application/octet-stream");
 
   scoped_ptr<HTTPTransport> http_transport(HTTPTransport::Create());
   http_transport->SetURL(url_);
   HTTPHeaders::value_type content_type =
       http_multipart_builder.GetContentType();
   http_transport->SetHeader(content_type.first, content_type.second);
   http_transport->SetBodyStream(http_multipart_builder.GetBodyStream().Pass());
   // 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;
 }
 
-// static
-void* CrashReportUploadThread::RunThreadMain(void* arg) {
-  CrashReportUploadThread* self = static_cast<CrashReportUploadThread*>(arg);
-  self->ThreadMain();
-  return nullptr;
-}
-
 }  // namespace crashpad