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}
88 lines
2.9 KiB
C++
88 lines
2.9 KiB
C++
/*
|
|
* Copyright 2011 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 WEBRTC_RTC_BASE_ATOMICOPS_H_
|
|
#define WEBRTC_RTC_BASE_ATOMICOPS_H_
|
|
|
|
#if defined(WEBRTC_WIN)
|
|
// Include winsock2.h before including <windows.h> to maintain consistency with
|
|
// win32.h. We can't include win32.h directly here since it pulls in
|
|
// headers such as basictypes.h which causes problems in Chromium where webrtc
|
|
// exists as two separate projects, webrtc and libjingle.
|
|
#include <winsock2.h>
|
|
#include <windows.h>
|
|
#endif // defined(WEBRTC_WIN)
|
|
|
|
namespace rtc {
|
|
class AtomicOps {
|
|
public:
|
|
#if defined(WEBRTC_WIN)
|
|
// Assumes sizeof(int) == sizeof(LONG), which it is on Win32 and Win64.
|
|
static int Increment(volatile int* i) {
|
|
return ::InterlockedIncrement(reinterpret_cast<volatile LONG*>(i));
|
|
}
|
|
static int Decrement(volatile int* i) {
|
|
return ::InterlockedDecrement(reinterpret_cast<volatile LONG*>(i));
|
|
}
|
|
static int AcquireLoad(volatile const int* i) {
|
|
return *i;
|
|
}
|
|
static void ReleaseStore(volatile int* i, int value) {
|
|
*i = value;
|
|
}
|
|
static int CompareAndSwap(volatile int* i, int old_value, int new_value) {
|
|
return ::InterlockedCompareExchange(reinterpret_cast<volatile LONG*>(i),
|
|
new_value,
|
|
old_value);
|
|
}
|
|
// Pointer variants.
|
|
template <typename T>
|
|
static T* AcquireLoadPtr(T* volatile* ptr) {
|
|
return *ptr;
|
|
}
|
|
template <typename T>
|
|
static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) {
|
|
return static_cast<T*>(::InterlockedCompareExchangePointer(
|
|
reinterpret_cast<PVOID volatile*>(ptr), new_value, old_value));
|
|
}
|
|
#else
|
|
static int Increment(volatile int* i) {
|
|
return __sync_add_and_fetch(i, 1);
|
|
}
|
|
static int Decrement(volatile int* i) {
|
|
return __sync_sub_and_fetch(i, 1);
|
|
}
|
|
static int AcquireLoad(volatile const int* i) {
|
|
return __atomic_load_n(i, __ATOMIC_ACQUIRE);
|
|
}
|
|
static void ReleaseStore(volatile int* i, int value) {
|
|
__atomic_store_n(i, value, __ATOMIC_RELEASE);
|
|
}
|
|
static int CompareAndSwap(volatile int* i, int old_value, int new_value) {
|
|
return __sync_val_compare_and_swap(i, old_value, new_value);
|
|
}
|
|
// Pointer variants.
|
|
template <typename T>
|
|
static T* AcquireLoadPtr(T* volatile* ptr) {
|
|
return __atomic_load_n(ptr, __ATOMIC_ACQUIRE);
|
|
}
|
|
template <typename T>
|
|
static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) {
|
|
return __sync_val_compare_and_swap(ptr, old_value, new_value);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
#endif // WEBRTC_RTC_BASE_ATOMICOPS_H_
|