mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00

This reverts commit16fe3f290a
. Reason for revert: After discussing this problem with nisse@ and yvesg@, we decided to modify how RTC_EXPORT works and avoid to depend on the macro COMPONENT_BUILD. RTC_EXPORT will instead depend on a macro WEBRTC_COMPONENT_BUILD (which can be set as a GN argument which defaults to false). When all the symbols needed by Chromium will be marked with RTC_EXPORT we will flip the GN arg in Chromium, setting to to `component_build` and from that moment, Chromium will depend on a WebRTC shared library when `component_build=true`. Original change's description: > Revert "Export symbols needed by the Chromium component build (part 1)." > > This reverts commit99eea42fc1
. > > Reason for revert: > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::UnwrapTurnPacket(unsigned char const *, unsigned int, unsigned int *, unsigned int *)" (__imp_?UnwrapTurnPacket@cricket@@YA_NPBEIPAI1@Z) > >>> referenced by obj/services/network/network_service/socket_manager.obj:("virtual void __thiscall network::P2PSocketManager::DumpPacket(class base::span<unsigned char const, 4294967295>, bool)" (?DumpPacket@P2PSocketManager@network@@EAEXV?$span@$$CBE$0PPPPPPPP@@base@@_N@Z)) > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ValidateRtpHeader(unsigned char const *, unsigned int, unsigned int *)" (__imp_?ValidateRtpHeader@cricket@@YA_NPBEIPAI@Z) > >>> referenced by obj/services/network/network_service/socket_manager.obj:("virtual void __thiscall network::P2PSocketManager::DumpPacket(class base::span<unsigned char const, 4294967295>, bool)" (?DumpPacket@P2PSocketManager@network@@EAEXV?$span@$$CBE$0PPPPPPPP@@base@@_N@Z)) > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ApplyPacketOptions(unsigned char *, unsigned int, struct rtc::PacketTimeUpdateParams const &, unsigned __int64)" (__imp_?ApplyPacketOptions@cricket@@YA_NPAEIABUPacketTimeUpdateParams@rtc@@_K@Z) > >>> referenced by obj/services/network/network_service/socket_tcp.obj:("virtual void __thiscall network::P2PSocketTcp::DoSend(class net::IPEndPoint const &, class std::vector<signed char, class std::allocator<signed char>> const &, struct rtc::PacketOptions const &, struct net::NetworkTrafficAnnotationTag)" (?DoSend@P2PSocketTcp@network@@MAEXABVIPEndPoint@net@@ABV?$vector@CV?$allocator@C@std@@@std@@ABUPacketOptions@rtc@@UNetworkTrafficAnnotationTag@4@@Z)) > >>> referenced by obj/services/network/network_service/socket_tcp.obj:("virtual void __thiscall network::P2PSocketStunTcp::DoSend(class net::IPEndPoint const &, class std::vector<signed char, class std::allocator<signed char>> const &, struct rtc::PacketOptions const &, struct net::NetworkTrafficAnnotationTag)" (?DoSend@P2PSocketStunTcp@network@@MAEXABVIPEndPoint@net@@ABV?$vector@CV?$allocator@C@std@@@std@@ABUPacketOptions@rtc@@UNetworkTrafficAnnotationTag@4@@Z)) > lld-link: error: undefined symbol: "__declspec(dllimport) bool __cdecl cricket::ApplyPacketOptions(unsigned char *, unsigned int, struct rtc::PacketTimeUpdateParams const &, unsigned __int64)" (__imp_?ApplyPacketOptions@cricket@@YA_NPAEIABUPacketTimeUpdateParams@rtc@@_K@Z) > >>> referenced by obj/services/network/network_service/socket_udp.obj:("bool __thiscall network::P2PSocketUdp::DoSend(struct network::P2PSocketUdp::PendingPacket const &)" (?DoSend@P2PSocketUdp@network@@AAE_NABUPendingPacket@12@@Z)) > > Original change's description: > > Reland "Reland "Export symbols needed by the Chromium component build (part 1)."" > > > > This reverts commitb49520bfc0
. > > > > Reason for revert: Problem fixed in https://chromium-review.googlesource.com/c/chromium/src/+/1261398. > > > > Original change's description: > > > Revert "Reland "Export symbols needed by the Chromium component build (part 1)."" > > > > > > This reverts commit588f4642d1
. > > > > > > Reason for revert: Breaks WebRTC Chromium FYI Win Builder (dbg). > > > lld-link: error: undefined symbol: "__declspec(dllimport) __thiscall webrtc::Config::Config(void)" (__imp_??0Config@webrtc@@QAE@XZ) > > > [...] > > > > > > Original change's description: > > > > Reland "Export symbols needed by the Chromium component build (part 1)." > > > > > > > > This reverts commit2ea9af2275
. > > > > > > > > Reason for revert: The problem will be fixed by > > > > https://chromium-review.googlesource.com/c/chromium/src/+/1261122. > > > > > > > > Original change's description: > > > > > Revert "Export symbols needed by the Chromium component build (part 1)." > > > > > > > > > > This reverts commit9e24dcff16
. > > > > > > > > > > Reason for revert: Breaks chromium.webrtc.fyi bots. > > > > > > > > > > Original change's description: > > > > > > Export symbols needed by the Chromium component build (part 1). > > > > > > > > > > > > This CL uses RTC_EXPORT (defined in rtc_base/system/rtc_export.h) > > > > > > to mark WebRTC symbols as visible from a shared library, this doesn't > > > > > > mean these symbols are part of the public API (please continue to refer > > > > > > to [1] for info about what is considered public WebRTC API). > > > > > > > > > > > > [1] - https://webrtc.googlesource.com/src/+/HEAD/native-api.md > > > > > > > > > > > > Bug: webrtc:9419 > > > > > > Change-Id: I802abd32874d42d3aa5ecd3c8022e7cf5e043d99 > > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103505 > > > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > > > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > > > > > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > > > > > > Cr-Commit-Position: refs/heads/master@{#24969} > > > > > > > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > > > > > > > Change-Id: I01f6e18f0d2c0f0309cdaa6c943c3927e1f1f49f > > > > > No-Presubmit: true > > > > > No-Tree-Checks: true > > > > > No-Try: true > > > > > Bug: webrtc:9419 > > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103720 > > > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > > > Cr-Commit-Position: refs/heads/master@{#24974} > > > > > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > > > > > Change-Id: I83bbc7f550fc23e823c4d055e0a6f60c828960dd > > > > No-Presubmit: true > > > > No-Tree-Checks: true > > > > No-Try: true > > > > Bug: webrtc:9419 > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103740 > > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#24980} > > > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > > > Change-Id: I4b7cfe492f2c8eeda5c8ac52520e0cfc95ade9b0 > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: webrtc:9419 > > > Reviewed-on: https://webrtc-review.googlesource.com/c/103801 > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#24983} > > > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > > > # Not skipping CQ checks because original CL landed > 1 day ago. > > > > Bug: webrtc:9419 > > Change-Id: Id986a0a03cdc2818690337784396882af067f7fa > > Reviewed-on: https://webrtc-review.googlesource.com/c/104602 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#25049} > > TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org > > Change-Id: I6f58b9c90defccdb160307783fb55271ab424fa1 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9419 > Reviewed-on: https://webrtc-review.googlesource.com/c/104623 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25050} TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org Change-Id: I4d01ed96ae40a8f9ca42c466be5c87653d75d7c1 Bug: webrtc:9419 Reviewed-on: https://webrtc-review.googlesource.com/c/104641 Reviewed-by: Yves Gerey <yvesg@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25108}
243 lines
8.6 KiB
C++
243 lines
8.6 KiB
C++
/*
|
|
* Copyright 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.
|
|
*/
|
|
|
|
#ifndef RTC_BASE_TASK_QUEUE_H_
|
|
#define RTC_BASE_TASK_QUEUE_H_
|
|
|
|
#include <memory>
|
|
#include <type_traits>
|
|
#include <utility>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/scoped_ref_ptr.h"
|
|
#include "rtc_base/system/rtc_export.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace rtc {
|
|
|
|
// Base interface for asynchronously executed tasks.
|
|
// The interface basically consists of a single function, Run(), that executes
|
|
// on the target queue. For more details see the Run() method and TaskQueue.
|
|
class QueuedTask {
|
|
public:
|
|
QueuedTask() {}
|
|
virtual ~QueuedTask() {}
|
|
|
|
// Main routine that will run when the task is executed on the desired queue.
|
|
// The task should return |true| to indicate that it should be deleted or
|
|
// |false| to indicate that the queue should consider ownership of the task
|
|
// having been transferred. Returning |false| can be useful if a task has
|
|
// re-posted itself to a different queue or is otherwise being re-used.
|
|
virtual bool Run() = 0;
|
|
|
|
private:
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(QueuedTask);
|
|
};
|
|
|
|
// Simple implementation of QueuedTask for use with rtc::Bind and lambdas.
|
|
template <class Closure>
|
|
class ClosureTask : public QueuedTask {
|
|
public:
|
|
explicit ClosureTask(Closure&& closure)
|
|
: closure_(std::forward<Closure>(closure)) {}
|
|
|
|
private:
|
|
bool Run() override {
|
|
closure_();
|
|
return true;
|
|
}
|
|
|
|
typename std::remove_const<
|
|
typename std::remove_reference<Closure>::type>::type closure_;
|
|
};
|
|
|
|
// Extends ClosureTask to also allow specifying cleanup code.
|
|
// This is useful when using lambdas if guaranteeing cleanup, even if a task
|
|
// was dropped (queue is too full), is required.
|
|
template <class Closure, class Cleanup>
|
|
class ClosureTaskWithCleanup : public ClosureTask<Closure> {
|
|
public:
|
|
ClosureTaskWithCleanup(Closure&& closure, Cleanup&& cleanup)
|
|
: ClosureTask<Closure>(std::forward<Closure>(closure)),
|
|
cleanup_(std::forward<Cleanup>(cleanup)) {}
|
|
~ClosureTaskWithCleanup() { cleanup_(); }
|
|
|
|
private:
|
|
typename std::remove_const<
|
|
typename std::remove_reference<Cleanup>::type>::type cleanup_;
|
|
};
|
|
|
|
// Convenience function to construct closures that can be passed directly
|
|
// to methods that support std::unique_ptr<QueuedTask> but not template
|
|
// based parameters.
|
|
template <class Closure>
|
|
static std::unique_ptr<QueuedTask> NewClosure(Closure&& closure) {
|
|
return absl::make_unique<ClosureTask<Closure>>(
|
|
std::forward<Closure>(closure));
|
|
}
|
|
|
|
template <class Closure, class Cleanup>
|
|
static std::unique_ptr<QueuedTask> NewClosure(Closure&& closure,
|
|
Cleanup&& cleanup) {
|
|
return absl::make_unique<ClosureTaskWithCleanup<Closure, Cleanup>>(
|
|
std::forward<Closure>(closure), std::forward<Cleanup>(cleanup));
|
|
}
|
|
|
|
// Implements a task queue that asynchronously executes tasks in a way that
|
|
// guarantees that they're executed in FIFO order and that tasks never overlap.
|
|
// Tasks may always execute on the same worker thread and they may not.
|
|
// To DCHECK that tasks are executing on a known task queue, use IsCurrent().
|
|
//
|
|
// Here are some usage examples:
|
|
//
|
|
// 1) Asynchronously running a lambda:
|
|
//
|
|
// class MyClass {
|
|
// ...
|
|
// TaskQueue queue_("MyQueue");
|
|
// };
|
|
//
|
|
// void MyClass::StartWork() {
|
|
// queue_.PostTask([]() { Work(); });
|
|
// ...
|
|
//
|
|
// 2) Doing work asynchronously on a worker queue and providing a notification
|
|
// callback on the current queue, when the work has been done:
|
|
//
|
|
// void MyClass::StartWorkAndLetMeKnowWhenDone(
|
|
// std::unique_ptr<QueuedTask> callback) {
|
|
// DCHECK(TaskQueue::Current()) << "Need to be running on a queue";
|
|
// queue_.PostTaskAndReply([]() { Work(); }, std::move(callback));
|
|
// }
|
|
// ...
|
|
// my_class->StartWorkAndLetMeKnowWhenDone(
|
|
// NewClosure([]() { RTC_LOG(INFO) << "The work is done!";}));
|
|
//
|
|
// 3) Posting a custom task on a timer. The task posts itself again after
|
|
// every running:
|
|
//
|
|
// class TimerTask : public QueuedTask {
|
|
// public:
|
|
// TimerTask() {}
|
|
// private:
|
|
// bool Run() override {
|
|
// ++count_;
|
|
// TaskQueue::Current()->PostDelayedTask(
|
|
// std::unique_ptr<QueuedTask>(this), 1000);
|
|
// // Ownership has been transferred to the next occurance,
|
|
// // so return false to prevent from being deleted now.
|
|
// return false;
|
|
// }
|
|
// int count_ = 0;
|
|
// };
|
|
// ...
|
|
// queue_.PostDelayedTask(
|
|
// std::unique_ptr<QueuedTask>(new TimerTask()), 1000);
|
|
//
|
|
// For more examples, see task_queue_unittests.cc.
|
|
//
|
|
// A note on destruction:
|
|
//
|
|
// When a TaskQueue is deleted, pending tasks will not be executed but they will
|
|
// be deleted. The deletion of tasks may happen asynchronously after the
|
|
// TaskQueue itself has been deleted or it may happen synchronously while the
|
|
// TaskQueue instance is being deleted. This may vary from one OS to the next
|
|
// so assumptions about lifetimes of pending tasks should not be made.
|
|
class RTC_LOCKABLE RTC_EXPORT TaskQueue {
|
|
public:
|
|
// TaskQueue priority levels. On some platforms these will map to thread
|
|
// priorities, on others such as Mac and iOS, GCD queue priorities.
|
|
enum class Priority {
|
|
NORMAL = 0,
|
|
HIGH,
|
|
LOW,
|
|
};
|
|
|
|
explicit TaskQueue(const char* queue_name,
|
|
Priority priority = Priority::NORMAL);
|
|
~TaskQueue();
|
|
|
|
static TaskQueue* Current();
|
|
|
|
// Used for DCHECKing the current queue.
|
|
bool IsCurrent() const;
|
|
|
|
// TODO(tommi): For better debuggability, implement RTC_FROM_HERE.
|
|
|
|
// Ownership of the task is passed to PostTask.
|
|
void PostTask(std::unique_ptr<QueuedTask> task);
|
|
void PostTaskAndReply(std::unique_ptr<QueuedTask> task,
|
|
std::unique_ptr<QueuedTask> reply,
|
|
TaskQueue* reply_queue);
|
|
void PostTaskAndReply(std::unique_ptr<QueuedTask> task,
|
|
std::unique_ptr<QueuedTask> reply);
|
|
|
|
// Schedules a task to execute a specified number of milliseconds from when
|
|
// the call is made. The precision should be considered as "best effort"
|
|
// and in some cases, such as on Windows when all high precision timers have
|
|
// been used up, can be off by as much as 15 millseconds (although 8 would be
|
|
// more likely). This can be mitigated by limiting the use of delayed tasks.
|
|
void PostDelayedTask(std::unique_ptr<QueuedTask> task, uint32_t milliseconds);
|
|
|
|
// std::enable_if is used here to make sure that calls to PostTask() with
|
|
// std::unique_ptr<SomeClassDerivedFromQueuedTask> would not end up being
|
|
// caught by this template.
|
|
template <class Closure,
|
|
typename std::enable_if<!std::is_convertible<
|
|
Closure,
|
|
std::unique_ptr<QueuedTask>>::value>::type* = nullptr>
|
|
void PostTask(Closure&& closure) {
|
|
PostTask(NewClosure(std::forward<Closure>(closure)));
|
|
}
|
|
|
|
// See documentation above for performance expectations.
|
|
template <class Closure,
|
|
typename std::enable_if<!std::is_convertible<
|
|
Closure,
|
|
std::unique_ptr<QueuedTask>>::value>::type* = nullptr>
|
|
void PostDelayedTask(Closure&& closure, uint32_t milliseconds) {
|
|
PostDelayedTask(NewClosure(std::forward<Closure>(closure)), milliseconds);
|
|
}
|
|
|
|
template <class Closure1, class Closure2>
|
|
void PostTaskAndReply(Closure1&& task,
|
|
Closure2&& reply,
|
|
TaskQueue* reply_queue) {
|
|
PostTaskAndReply(NewClosure(std::forward<Closure1>(task)),
|
|
NewClosure(std::forward<Closure2>(reply)), reply_queue);
|
|
}
|
|
|
|
template <class Closure>
|
|
void PostTaskAndReply(std::unique_ptr<QueuedTask> task, Closure&& reply) {
|
|
PostTaskAndReply(std::move(task), NewClosure(std::forward<Closure>(reply)));
|
|
}
|
|
|
|
template <class Closure>
|
|
void PostTaskAndReply(Closure&& task, std::unique_ptr<QueuedTask> reply) {
|
|
PostTaskAndReply(NewClosure(std::forward<Closure>(task)), std::move(reply));
|
|
}
|
|
|
|
template <class Closure1, class Closure2>
|
|
void PostTaskAndReply(Closure1&& task, Closure2&& reply) {
|
|
PostTaskAndReply(NewClosure(std::forward(task)),
|
|
NewClosure(std::forward(reply)));
|
|
}
|
|
|
|
private:
|
|
class Impl;
|
|
const scoped_refptr<Impl> impl_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(TaskQueue);
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // RTC_BASE_TASK_QUEUE_H_
|