mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-12 21:30:45 +01:00
e5f4c6b8d2
This is a reland of 69241a93fb
Fix: The problem was related to NO_MAIN_THREAD_WRAPPING, which
affects https://source.chromium.org/chromium/chromium/src/+/master:third_party/webrtc/rtc_base/thread.cc;l=257-263;drc=7acc2d9fe3a6e3c4d8881d2bdfc9b8968a724cd5.
The original CL didn't attach the definition of the macro
NO_MAIN_THREAD_WRAPPING when building for Chromium (which doesn't have
to be related to //rtc_base anymore but to //rtc_base:threading).
Original change's description:
> Refactor rtc_base build targets.
>
> The "//rtc_base:rtc_base" build target has historically been one of the
> biggest targets in the WebRTC build. Big targets are the main source of
> circular dependencies and non-API types leakage.
>
> This CL is a step forward into splitting "//rtc_base:rtc_base" into
> smaller targets (as originally started in 2018).
>
> The only non-automated changes are (like re-wiring the build system):
> * The creation of //rtc_base/async_resolver.{h,cc} which allows to
> break a circular dependency (is has been extracted from
> //rtc_base/net_helpers.{h,cc}).
> * The creation of //rtc_base/internal/default_socket_server.{h,cc} to
> break another circular dependency.
>
> Bug: webrtc:9987
> Change-Id: I0c8f5e7efe2c8fd8e6bffa0d6dd2dd494cf3df02
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196903
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#32941}
Bug: webrtc:9987
Change-Id: I7cdf49d2aac8357f1f50f90010bf2c2f62fa19f6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/202021
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33001}
72 lines
2.5 KiB
C++
72 lines
2.5 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef RTC_BASE_ASYNC_RESOLVER_H_
|
|
#define RTC_BASE_ASYNC_RESOLVER_H_
|
|
|
|
#if defined(WEBRTC_POSIX)
|
|
#include <sys/socket.h>
|
|
#elif WEBRTC_WIN
|
|
#include <winsock2.h> // NOLINT
|
|
#endif
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "rtc_base/async_resolver_interface.h"
|
|
#include "rtc_base/ip_address.h"
|
|
#include "rtc_base/socket_address.h"
|
|
#include "rtc_base/synchronization/sequence_checker.h"
|
|
#include "rtc_base/system/no_unique_address.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
#include "rtc_base/task_utils/pending_task_safety_flag.h"
|
|
#include "rtc_base/thread.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace rtc {
|
|
|
|
// AsyncResolver will perform async DNS resolution, signaling the result on
|
|
// the SignalDone from AsyncResolverInterface when the operation completes.
|
|
//
|
|
// This class is thread-compatible, and all methods and destruction needs to
|
|
// happen from the same rtc::Thread, except for Destroy which is allowed to
|
|
// happen on another context provided it's not happening concurrently to another
|
|
// public API call, and is the last access to the object.
|
|
class RTC_EXPORT AsyncResolver : public AsyncResolverInterface {
|
|
public:
|
|
AsyncResolver();
|
|
~AsyncResolver() override;
|
|
|
|
void Start(const SocketAddress& addr) override;
|
|
bool GetResolvedAddress(int family, SocketAddress* addr) const override;
|
|
int GetError() const override;
|
|
void Destroy(bool wait) override;
|
|
|
|
const std::vector<IPAddress>& addresses() const;
|
|
|
|
private:
|
|
void ResolveDone(std::vector<IPAddress> addresses, int error)
|
|
RTC_EXCLUSIVE_LOCKS_REQUIRED(sequence_checker_);
|
|
void MaybeSelfDestruct();
|
|
|
|
SocketAddress addr_ RTC_GUARDED_BY(sequence_checker_);
|
|
std::vector<IPAddress> addresses_ RTC_GUARDED_BY(sequence_checker_);
|
|
int error_ RTC_GUARDED_BY(sequence_checker_);
|
|
webrtc::ScopedTaskSafety safety_ RTC_GUARDED_BY(sequence_checker_);
|
|
std::unique_ptr<Thread> popup_thread_ RTC_GUARDED_BY(sequence_checker_);
|
|
bool recursion_check_ =
|
|
false; // Protects against SignalDone calling into Destroy.
|
|
bool destroy_called_ = false;
|
|
RTC_NO_UNIQUE_ADDRESS webrtc::SequenceChecker sequence_checker_;
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // RTC_BASE_ASYNC_RESOLVER_H_
|