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}
95 lines
2.1 KiB
C++
95 lines
2.1 KiB
C++
/*
|
|
* Copyright 2015 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/bufferqueue.h"
|
|
|
|
#include <algorithm>
|
|
|
|
namespace rtc {
|
|
|
|
BufferQueue::BufferQueue(size_t capacity, size_t default_size)
|
|
: capacity_(capacity), default_size_(default_size) {
|
|
}
|
|
|
|
BufferQueue::~BufferQueue() {
|
|
CritScope cs(&crit_);
|
|
|
|
for (Buffer* buffer : queue_) {
|
|
delete buffer;
|
|
}
|
|
for (Buffer* buffer : free_list_) {
|
|
delete buffer;
|
|
}
|
|
}
|
|
|
|
size_t BufferQueue::size() const {
|
|
CritScope cs(&crit_);
|
|
return queue_.size();
|
|
}
|
|
|
|
void BufferQueue::Clear() {
|
|
CritScope cs(&crit_);
|
|
while (!queue_.empty()) {
|
|
free_list_.push_back(queue_.front());
|
|
queue_.pop_front();
|
|
}
|
|
}
|
|
|
|
bool BufferQueue::ReadFront(void* buffer, size_t bytes, size_t* bytes_read) {
|
|
CritScope cs(&crit_);
|
|
if (queue_.empty()) {
|
|
return false;
|
|
}
|
|
|
|
bool was_writable = queue_.size() < capacity_;
|
|
Buffer* packet = queue_.front();
|
|
queue_.pop_front();
|
|
|
|
bytes = std::min(bytes, packet->size());
|
|
memcpy(buffer, packet->data(), bytes);
|
|
if (bytes_read) {
|
|
*bytes_read = bytes;
|
|
}
|
|
free_list_.push_back(packet);
|
|
if (!was_writable) {
|
|
NotifyWritableForTest();
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool BufferQueue::WriteBack(const void* buffer, size_t bytes,
|
|
size_t* bytes_written) {
|
|
CritScope cs(&crit_);
|
|
if (queue_.size() == capacity_) {
|
|
return false;
|
|
}
|
|
|
|
bool was_readable = !queue_.empty();
|
|
Buffer* packet;
|
|
if (!free_list_.empty()) {
|
|
packet = free_list_.back();
|
|
free_list_.pop_back();
|
|
} else {
|
|
packet = new Buffer(bytes, default_size_);
|
|
}
|
|
|
|
packet->SetData(static_cast<const uint8_t*>(buffer), bytes);
|
|
if (bytes_written) {
|
|
*bytes_written = bytes;
|
|
}
|
|
queue_.push_back(packet);
|
|
if (!was_readable) {
|
|
NotifyReadableForTest();
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace rtc
|