6776518bea
This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
64 lines
1.8 KiB
C++
64 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 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.
|
|
*/
|
|
|
|
#include "webrtc/base/sequenced_task_checker_impl.h"
|
|
|
|
#if defined(WEBRTC_MAC)
|
|
#include <dispatch/dispatch.h>
|
|
#endif
|
|
|
|
#include "webrtc/base/platform_thread.h"
|
|
#include "webrtc/base/sequenced_task_checker.h"
|
|
#include "webrtc/base/task_queue.h"
|
|
|
|
namespace rtc {
|
|
|
|
SequencedTaskCheckerImpl::SequencedTaskCheckerImpl()
|
|
: attached_(true), valid_queue_(TaskQueue::Current()) {}
|
|
|
|
SequencedTaskCheckerImpl::~SequencedTaskCheckerImpl() {}
|
|
|
|
bool SequencedTaskCheckerImpl::CalledSequentially() const {
|
|
QueueId current_queue = TaskQueue::Current();
|
|
#if defined(WEBRTC_MAC)
|
|
// If we're not running on a TaskQueue, use the system dispatch queue
|
|
// label as an identifier.
|
|
if (current_queue == nullptr)
|
|
current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL);
|
|
#endif
|
|
CritScope scoped_lock(&lock_);
|
|
if (!attached_) { // true if previously detached.
|
|
valid_queue_ = current_queue;
|
|
attached_ = true;
|
|
}
|
|
if (!valid_queue_)
|
|
return thread_checker_.CalledOnValidThread();
|
|
return valid_queue_ == current_queue;
|
|
}
|
|
|
|
void SequencedTaskCheckerImpl::Detach() {
|
|
CritScope scoped_lock(&lock_);
|
|
attached_ = false;
|
|
valid_queue_ = nullptr;
|
|
thread_checker_.DetachFromThread();
|
|
}
|
|
|
|
namespace internal {
|
|
|
|
SequencedTaskCheckerScope::SequencedTaskCheckerScope(
|
|
const SequencedTaskChecker* checker) {
|
|
RTC_DCHECK(checker->CalledSequentially());
|
|
}
|
|
|
|
SequencedTaskCheckerScope::~SequencedTaskCheckerScope() {}
|
|
|
|
} // namespace internal
|
|
} // namespace rtc
|