mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-11 09:08:06 +01:00
122397acfc
Changes to the CEF public API: - Add base::Bind, base::Callback, base::Lock, base::WeakPtr, scoped_refptr, scoped_ptr and supporting types. - Add include/wrapper/cef_closure_task.h helpers for converting a base::Closure to a CefTask. - Change CefRefPtr to extend scoped_refptr. -- Change CefBase method signatures to match RefCountedThreadSafeBase. - Change IMPLEMENT_REFCOUNTING to use base::AtomicRefCount*. -- Remove the CefAtomic* functions. -- IMPLEMENT_REFCOUNTING now enforces via a compile-time error that the correct class name was passed to the macro. - Change IMPLEMENT_LOCKING to use base::Lock. -- Remove the CefCriticalSection class. -- Deprecate the IMPLEMENT_LOCKING macro. -- base::Lock will DCHECK() in Debug builds if lock usage is reentrant. - Move include/internal/cef_tuple.h to include/base/cef_tuple.h. - Allow an empty |callback| parameter passed to CefBeginTracing. Changes to the CEF implementation: - Fix incorrect names passed to the IMPLEMENT_REFCOUNTING macro. - Fix instances of reentrant locking in the CefXmlObject and CefRequest implementations. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cef_unittests: - Add tests/unittests/chromium_includes.h and always include it first from unit test .cc files to avoid name conflicts with Chromium types. - Fix wrong header include ordering. - Remove use of the IMPLEMENT_LOCKING macro. Changes to cefclient and cefsimple: - Use base::Bind and cef_closure_task.h instead of NewCefRunnable*. - Remove use of the IMPEMENT_LOCKING macro. - Fix incorrect/unnecessary locking. - Add additional runtime thread checks. - Windows: Perform actions on the UI thread instead of the main thread when running in multi-threaded-message-loop mode to avoid excessive locking. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1769 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
224 lines
7.1 KiB
C++
224 lines
7.1 KiB
C++
// Copyright (c) 2012 Google Inc. All rights reserved.
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are
|
|
// met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following disclaimer
|
|
// in the documentation and/or other materials provided with the
|
|
// distribution.
|
|
// * Neither the name of Google Inc. nor the name Chromium Embedded
|
|
// Framework nor the names of its contributors may be used to endorse
|
|
// or promote products derived from this software without specific prior
|
|
// written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
// Do not include this header file directly. Use base/cef_atomicops.h
|
|
// instead.
|
|
|
|
#ifndef CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
|
|
#define CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
|
|
|
|
#include <libkern/OSAtomic.h>
|
|
|
|
namespace base {
|
|
namespace subtle {
|
|
|
|
inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
|
|
Atomic32 old_value,
|
|
Atomic32 new_value) {
|
|
Atomic32 prev_value;
|
|
do {
|
|
if (OSAtomicCompareAndSwap32(old_value, new_value,
|
|
const_cast<Atomic32*>(ptr))) {
|
|
return old_value;
|
|
}
|
|
prev_value = *ptr;
|
|
} while (prev_value == old_value);
|
|
return prev_value;
|
|
}
|
|
|
|
inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr,
|
|
Atomic32 new_value) {
|
|
Atomic32 old_value;
|
|
do {
|
|
old_value = *ptr;
|
|
} while (!OSAtomicCompareAndSwap32(old_value, new_value,
|
|
const_cast<Atomic32*>(ptr)));
|
|
return old_value;
|
|
}
|
|
|
|
inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr,
|
|
Atomic32 increment) {
|
|
return OSAtomicAdd32(increment, const_cast<Atomic32*>(ptr));
|
|
}
|
|
|
|
inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr,
|
|
Atomic32 increment) {
|
|
return OSAtomicAdd32Barrier(increment, const_cast<Atomic32*>(ptr));
|
|
}
|
|
|
|
inline void MemoryBarrier() {
|
|
OSMemoryBarrier();
|
|
}
|
|
|
|
inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr,
|
|
Atomic32 old_value,
|
|
Atomic32 new_value) {
|
|
Atomic32 prev_value;
|
|
do {
|
|
if (OSAtomicCompareAndSwap32Barrier(old_value, new_value,
|
|
const_cast<Atomic32*>(ptr))) {
|
|
return old_value;
|
|
}
|
|
prev_value = *ptr;
|
|
} while (prev_value == old_value);
|
|
return prev_value;
|
|
}
|
|
|
|
inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr,
|
|
Atomic32 old_value,
|
|
Atomic32 new_value) {
|
|
return Acquire_CompareAndSwap(ptr, old_value, new_value);
|
|
}
|
|
|
|
inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) {
|
|
*ptr = value;
|
|
}
|
|
|
|
inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
|
|
*ptr = value;
|
|
MemoryBarrier();
|
|
}
|
|
|
|
inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
|
|
MemoryBarrier();
|
|
*ptr = value;
|
|
}
|
|
|
|
inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) {
|
|
return *ptr;
|
|
}
|
|
|
|
inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) {
|
|
Atomic32 value = *ptr;
|
|
MemoryBarrier();
|
|
return value;
|
|
}
|
|
|
|
inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
|
|
MemoryBarrier();
|
|
return *ptr;
|
|
}
|
|
|
|
#ifdef __LP64__
|
|
|
|
// 64-bit implementation on 64-bit platform
|
|
|
|
inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr,
|
|
Atomic64 old_value,
|
|
Atomic64 new_value) {
|
|
Atomic64 prev_value;
|
|
do {
|
|
if (OSAtomicCompareAndSwap64(old_value, new_value,
|
|
reinterpret_cast<volatile int64_t*>(ptr))) {
|
|
return old_value;
|
|
}
|
|
prev_value = *ptr;
|
|
} while (prev_value == old_value);
|
|
return prev_value;
|
|
}
|
|
|
|
inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr,
|
|
Atomic64 new_value) {
|
|
Atomic64 old_value;
|
|
do {
|
|
old_value = *ptr;
|
|
} while (!OSAtomicCompareAndSwap64(old_value, new_value,
|
|
reinterpret_cast<volatile int64_t*>(ptr)));
|
|
return old_value;
|
|
}
|
|
|
|
inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr,
|
|
Atomic64 increment) {
|
|
return OSAtomicAdd64(increment, reinterpret_cast<volatile int64_t*>(ptr));
|
|
}
|
|
|
|
inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr,
|
|
Atomic64 increment) {
|
|
return OSAtomicAdd64Barrier(increment,
|
|
reinterpret_cast<volatile int64_t*>(ptr));
|
|
}
|
|
|
|
inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr,
|
|
Atomic64 old_value,
|
|
Atomic64 new_value) {
|
|
Atomic64 prev_value;
|
|
do {
|
|
if (OSAtomicCompareAndSwap64Barrier(
|
|
old_value, new_value, reinterpret_cast<volatile int64_t*>(ptr))) {
|
|
return old_value;
|
|
}
|
|
prev_value = *ptr;
|
|
} while (prev_value == old_value);
|
|
return prev_value;
|
|
}
|
|
|
|
inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
|
|
Atomic64 old_value,
|
|
Atomic64 new_value) {
|
|
// The lib kern interface does not distinguish between
|
|
// Acquire and Release memory barriers; they are equivalent.
|
|
return Acquire_CompareAndSwap(ptr, old_value, new_value);
|
|
}
|
|
|
|
inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) {
|
|
*ptr = value;
|
|
}
|
|
|
|
inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) {
|
|
*ptr = value;
|
|
MemoryBarrier();
|
|
}
|
|
|
|
inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) {
|
|
MemoryBarrier();
|
|
*ptr = value;
|
|
}
|
|
|
|
inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
|
|
return *ptr;
|
|
}
|
|
|
|
inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) {
|
|
Atomic64 value = *ptr;
|
|
MemoryBarrier();
|
|
return value;
|
|
}
|
|
|
|
inline Atomic64 Release_Load(volatile const Atomic64* ptr) {
|
|
MemoryBarrier();
|
|
return *ptr;
|
|
}
|
|
|
|
#endif // defined(__LP64__)
|
|
|
|
} // namespace base::subtle
|
|
} // namespace base
|
|
|
|
#endif // CEF_INCLUDE_BASE_INTERNAL_CEF_ATOMICOPS_MAC_H_
|