admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format /rtc_base folder

Browse Source 
Formatting done via:

git ls-files | grep -E '^rtc_base\/.*\.(h|cc|mm)' | xargs clang-format -i

No-Iwyu: Includes didn't change and it isn't related to formatting
Bug: webrtc:42225392
Change-Id: I11c1ae6d6ea49c744a4e60a1a032e3d5ae7bce1f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/373906
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43688}
This commit is contained in:
Boris Tsirkin 2025-01-08 07:01:43 -08:00 committed by WebRTC LUCI CQ
parent d7b4c56d57
commit 5654f891bb
8 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtc_base/byte_order.h
View File

@ -45,7 +45,7 @@
#include <winsock2.h> #include <winsock2.h>
#else #else
#include <netinet/in.h> // no-presubmit-check #include <netinet/in.h> // no-presubmit-check
#endif // defined(WEBRTC_WIN) #endif // defined(WEBRTC_WIN)
#if defined(WEBRTC_ARCH_LITTLE_ENDIAN) #if defined(WEBRTC_ARCH_LITTLE_ENDIAN)
#define htobe16(v) htons(v) #define htobe16(v) htons(v)

1
rtc_base/numerics/sequence_number_util.h
View File

@ -11,7 +11,6 @@
#ifndef RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_ #ifndef RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
#define RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_ #define RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
#include <limits> #include <limits>
#include <type_traits> #include <type_traits>

68
rtc_base/physical_socket_server.cc
View File

@ -524,43 +524,43 @@ int PhysicalSocket::DoReadFromSocket(void* buffer,
msg.msg_name = addr; msg.msg_name = addr;
msg.msg_namelen = addr_len; msg.msg_namelen = addr_len;
} }
// TODO(bugs.webrtc.org/15368): What size is needed? IPV6_TCLASS is supposed // TODO(bugs.webrtc.org/15368): What size is needed? IPV6_TCLASS is supposed
// to be an int. Why is a larger size needed? // to be an int. Why is a larger size needed?
char control[CMSG_SPACE(sizeof(struct timeval) + 5 * sizeof(int))] = {}; char control[CMSG_SPACE(sizeof(struct timeval) + 5 * sizeof(int))] = {};
if (timestamp || ecn) { if (timestamp || ecn) {
*timestamp = -1; *timestamp = -1;
msg.msg_control = &control; msg.msg_control = &control;
msg.msg_controllen = sizeof(control); msg.msg_controllen = sizeof(control);
} }
received = ::recvmsg(s_, &msg, 0); received = ::recvmsg(s_, &msg, 0);
if (received <= 0) { if (received <= 0) {
// An error occured or shut down. // An error occured or shut down.
return received; return received;
} }
if (timestamp || ecn) { if (timestamp || ecn) {
struct cmsghdr* cmsg; struct cmsghdr* cmsg;
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (ecn) { if (ecn) {
if ((cmsg->cmsg_type == IPV6_TCLASS && if ((cmsg->cmsg_type == IPV6_TCLASS &&
cmsg->cmsg_level == IPPROTO_IPV6) || cmsg->cmsg_level == IPPROTO_IPV6) ||
(cmsg->cmsg_type == IP_TOS && cmsg->cmsg_level == IPPROTO_IP)) { (cmsg->cmsg_type == IP_TOS && cmsg->cmsg_level == IPPROTO_IP)) {
*ecn = EcnFromDs(CMSG_DATA(cmsg)[0]); *ecn = EcnFromDs(CMSG_DATA(cmsg)[0]);
}
}
if (cmsg->cmsg_level != SOL_SOCKET)
continue;
if (timestamp && cmsg->cmsg_type == SCM_TIMESTAMP) {
timeval ts;
std::memcpy(static_cast<void*>(&ts), CMSG_DATA(cmsg), sizeof(ts));
*timestamp =
rtc::kNumMicrosecsPerSec * static_cast<int64_t>(ts.tv_sec) +
static_cast<int64_t>(ts.tv_usec);
} }
} }
if (cmsg->cmsg_level != SOL_SOCKET)
continue;
if (timestamp && cmsg->cmsg_type == SCM_TIMESTAMP) {
timeval ts;
std::memcpy(static_cast<void*>(&ts), CMSG_DATA(cmsg), sizeof(ts));
*timestamp =
rtc::kNumMicrosecsPerSec * static_cast<int64_t>(ts.tv_sec) +
static_cast<int64_t>(ts.tv_usec);
}
} }
if (out_addr) { }
SocketAddressFromSockAddrStorage(addr_storage, out_addr); if (out_addr) {
} SocketAddressFromSockAddrStorage(addr_storage, out_addr);
}
return received; return received;
#else #else

1
rtc_base/ssl_stream_adapter_unittest.cc
View File

@ -563,7 +563,6 @@ class SSLStreamAdapterTestBase : public ::testing::Test,
} }
void TestHandshake(bool expect_success = true) { void TestHandshake(bool expect_success = true) {
if (!dtls_) { if (!dtls_) {
// Make sure we simulate a reliable network for TLS. // Make sure we simulate a reliable network for TLS.
// This is just a check to make sure that people don't write wrong // This is just a check to make sure that people don't write wrong

2
rtc_base/string_encode.cc
View File

@ -66,7 +66,7 @@ void hex_encode_with_delimiter(char* buffer,
while (srcpos < srclen) { while (srcpos < srclen) {
unsigned char ch = bsource[srcpos++]; unsigned char ch = bsource[srcpos++];
buffer[bufpos] = hex_encode((ch >> 4) & 0xF); buffer[bufpos] = hex_encode((ch >> 4) & 0xF);
buffer[bufpos + 1] = hex_encode((ch)&0xF); buffer[bufpos + 1] = hex_encode((ch) & 0xF);
bufpos += 2; bufpos += 2;
// Don't write a delimiter after the last byte. // Don't write a delimiter after the last byte.

4
rtc_base/system/cocoa_threading.mm
View File

@ -17,7 +17,9 @@ void InitCocoaMultiThreading() {
static BOOL is_cocoa_multithreaded = [NSThread isMultiThreaded]; static BOOL is_cocoa_multithreaded = [NSThread isMultiThreaded];
if (!is_cocoa_multithreaded) { if (!is_cocoa_multithreaded) {
// +[NSObject class] is idempotent. // +[NSObject class] is idempotent.
[NSThread detachNewThreadSelector:@selector(class) toTarget:[NSObject class] withObject:nil]; [NSThread detachNewThreadSelector:@selector(class)
toTarget:[NSObject class]
withObject:nil];
is_cocoa_multithreaded = YES; is_cocoa_multithreaded = YES;
RTC_DCHECK([NSThread isMultiThreaded]); RTC_DCHECK([NSThread isMultiThreaded]);
} }

6
rtc_base/task_utils/repeating_task_unittest.cc
View File

@ -331,7 +331,7 @@ TEST(RepeatingTaskTest, ClockIntegration) {
NiceMock<MockTaskQueue> task_queue; NiceMock<MockTaskQueue> task_queue;
ON_CALL(task_queue, PostDelayedTaskImpl) ON_CALL(task_queue, PostDelayedTaskImpl)
.WillByDefault([&](absl::AnyInvocable<void() &&> task, TimeDelta delay, .WillByDefault([&](absl::AnyInvocable<void()&&> task, TimeDelta delay,
const MockTaskQueue::PostDelayedTaskTraits&, const MockTaskQueue::PostDelayedTaskTraits&,
const Location&) { const Location&) {
EXPECT_EQ(delay, expected_delay); EXPECT_EQ(delay, expected_delay);
@ -350,7 +350,7 @@ TEST(RepeatingTaskTest, ClockIntegration) {
TaskQueueBase::DelayPrecision::kLow, &clock); TaskQueueBase::DelayPrecision::kLow, &clock);
clock.AdvanceTimeMilliseconds(100); clock.AdvanceTimeMilliseconds(100);
absl::AnyInvocable<void()&&> task_to_run = std::move(delayed_task); absl::AnyInvocable<void() &&> task_to_run = std::move(delayed_task);
expected_delay = TimeDelta::Millis(90); expected_delay = TimeDelta::Millis(90);
std::move(task_to_run)(); std::move(task_to_run)();
EXPECT_NE(delayed_task, nullptr); EXPECT_NE(delayed_task, nullptr);
@ -362,7 +362,7 @@ TEST(RepeatingTaskTest, CanBeStoppedAfterTaskQueueDeletedTheRepeatingTask) {
MockTaskQueue task_queue; MockTaskQueue task_queue;
EXPECT_CALL(task_queue, PostDelayedTaskImpl) EXPECT_CALL(task_queue, PostDelayedTaskImpl)
.WillOnce(WithArg<0>([&](absl::AnyInvocable<void() &&> task) { .WillOnce(WithArg<0>([&](absl::AnyInvocable<void()&&> task) {
repeating_task = std::move(task); repeating_task = std::move(task);
})); }));

4
rtc_base/thread.cc
View File

@ -415,7 +415,7 @@ absl::AnyInvocable<void() &&> Thread::Get(int cmsWait) {
} }
// Pull a message off the message queue, if available. // Pull a message off the message queue, if available.
if (!messages_.empty()) { if (!messages_.empty()) {
absl::AnyInvocable<void()&&> task = std::move(messages_.front()); absl::AnyInvocable<void() &&> task = std::move(messages_.front());
messages_.pop(); messages_.pop();
return task; return task;
} }
@ -845,7 +845,7 @@ bool Thread::ProcessMessages(int cmsLoop) {
#if defined(WEBRTC_MAC) #if defined(WEBRTC_MAC)
ScopedAutoReleasePool pool; ScopedAutoReleasePool pool;
#endif #endif
absl::AnyInvocable<void()&&> task = Get(cmsNext); absl::AnyInvocable<void() &&> task = Get(cmsNext);
if (!task) if (!task)
return !IsQuitting(); return !IsQuitting();
Dispatch(std::move(task)); Dispatch(std::move(task));