Delete SignalThread class.

webrtc/base/nethelpers.cc

 /*
  *  Copyright 2008 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.
  */
 
 #include "webrtc/base/nethelpers.h"
 
 #include <memory>
 
 #if defined(WEBRTC_WIN)
 #include <ws2spi.h>
 #include <ws2tcpip.h>
 #include "webrtc/base/win32.h"
 #endif
 #if defined(WEBRTC_POSIX) && !defined(__native_client__)
 #if defined(WEBRTC_ANDROID)
 #include "webrtc/base/ifaddrs-android.h"
 #else
 #include <ifaddrs.h>
 #endif
 #endif  // defined(WEBRTC_POSIX) && !defined(__native_client__)
 
+#include "webrtc/base/bind.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
-#include "webrtc/base/signalthread.h"
+#include "webrtc/base/thread.h"
 
 namespace rtc {
 
+namespace {
 int ResolveHostname(const std::string& hostname, int family,
                     std::vector<IPAddress>* addresses) {
 #ifdef __native_client__
   RTC_NOTREACHED();
   LOG(LS_WARNING) << "ResolveHostname() is not implemented for NaCl";
   return -1;
 #else  // __native_client__
   if (!addresses) {
     return -1;
   }
@@ skipping 29 matching lines @@
       IPAddress ip;
       if (IPFromAddrInfo(cursor, &ip)) {
         addresses->push_back(ip);
       }
     }
   }
   freeaddrinfo(result);
   return 0;
 #endif  // !__native_client__
 }
+}  // namespace
 
 // AsyncResolver
 AsyncResolver::AsyncResolver()
-    : SignalThread(false /* use_socket_server */), error_(-1) {}
+    : construction_thread_(Thread::Current()),
+      worker_(&ThreadEntry_w, this, "AsyncResolver") {}
 
-AsyncResolver::~AsyncResolver() = default;
+AsyncResolver::~AsyncResolver() {
+  RTC_DCHECK(construction_thread_->IsCurrent());
+  worker_.Stop();
+}
 
 void AsyncResolver::Start(const SocketAddress& addr) {
+  RTC_DCHECK(construction_thread_->IsCurrent());
+  RTC_DCHECK(!worker_.IsRunning());
   addr_ = addr;
-  // SignalThred Start will kickoff the resolve process.
-  SignalThread::Start();
+  worker_.Start();

[tommi, 2017/06/15 10:20:32]

implementing a custom QueuedTask that handles the PostTaskAndReply logic
(posting to construction_thread_ once done) could be a way to use a taskqueue +
PostTask.

[nisse-webrtc, 2017/06/15 11:33:47]

I'll give it a try.

 }
 
 bool AsyncResolver::GetResolvedAddress(int family, SocketAddress* addr) const {
   if (error_ != 0 || addresses_.empty())
     return false;
 
   *addr = addr_;
   for (size_t i = 0; i < addresses_.size(); ++i) {
     if (family == addresses_[i].family()) {
       addr->SetResolvedIP(addresses_[i]);
       return true;
     }
   }
   return false;
 }
 
 int AsyncResolver::GetError() const {
   return error_;
 }
 
 void AsyncResolver::Destroy(bool wait) {
-  SignalThread::Destroy(wait);
+  RTC_DCHECK(construction_thread_->IsCurrent());
+  // If we don't wait here, we will nevertheless wait in the destructor.
+  if (wait) {

[tommi, 2017/06/15 10:20:32]

why is wait == false supported?

[nisse-webrtc, 2017/06/15 11:33:47]

It's part of the AsyncResolverInterface, which I don't intend to change in this
cl.

And it's always false, when called from within webrtc, see, e.g.,
https://cs.chromium.org/chromium/src/third_party/webrtc/base/physicalsocketse...

For a task queue implementation, should wait == true imply destruction of the
task queue? If the task queue is destroyed while some task in the queue is
running, I imagine the destruction will block until the current task is
complete? And in the case of a task queue with a dedicated thread, imply a
pthread_join?

+    worker_.Stop();
+  }
 }
 
-void AsyncResolver::DoWork() {
-  error_ = ResolveHostname(addr_.hostname().c_str(), addr_.family(),
-                           &addresses_);
+void AsyncResolver::ResolveAddress_w() {
+  RTC_DCHECK(IsThreadRefEqual(worker_.GetThreadRef(), CurrentThreadRef()));
+  std::vector<IPAddress> addresses;
+  int error = ResolveHostname(addr_.hostname().c_str(), addr_.family(),
+                              &addresses);
+  // Ensure SignalDone is called on the main thread.
+  construction_thread_->Invoke<void>(

[nisse-webrtc, 2017/06/09 09:44:52]

Actually, I don't think there's any need for this method to block waiting for
call to complete on the |construction_thread_|. Is there any easy way to do a
"non-blocking invoke", making copies of the arguments as needed?

[Taylor Brandstetter, 2017/06/09 18:02:58]

Using an AsyncInvoker is the most convenient way I know of.

+      RTC_FROM_HERE, rtc::Bind(&AsyncResolver::ResolveDone, this,
+                               error, addresses));

[tommi, 2017/06/15 10:20:32]

std::move? (or will address be implicitly moved?)

[nisse-webrtc, 2017/06/15 11:33:47]

Done.

 }
 
-void AsyncResolver::OnWorkDone() {
+void AsyncResolver::ResolveDone(int error, std::vector<IPAddress> addresses) {
+  RTC_DCHECK(construction_thread_->IsCurrent());
+  error_ = error;
+  addresses_ = addresses;

[tommi, 2017/06/15 10:20:32]

std::move

   SignalDone(this);
 }
 
+// static
+void AsyncResolver::ThreadEntry_w(void* p) {

[tommi, 2017/06/15 10:20:32]

What about using a TaskQueue?

+  AsyncResolver* resolver = static_cast<AsyncResolver*>(p);
+  resolver->ResolveAddress_w();
+}
+
 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size) {
 #if defined(WEBRTC_WIN)
   return win32_inet_ntop(af, src, dst, size);
 #else
   return ::inet_ntop(af, src, dst, size);
 #endif
 }
 
 int inet_pton(int af, const char* src, void *dst) {
 #if defined(WEBRTC_WIN)
@@ skipping 72 matching lines @@
       break;
     }
   }
   freeifaddrs(ifa);
   return has_ipv6;
 #else
   return true;
 #endif
 }
 }  // namespace rtc