mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 17:46:04 +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
66 lines
2.2 KiB
C++
66 lines
2.2 KiB
C++
// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "include/base/cef_thread_collision_warner.h"
|
|
|
|
#include "include/base/cef_logging.h"
|
|
#include "include/internal/cef_thread_internal.h"
|
|
|
|
namespace base {
|
|
|
|
void DCheckAsserter::warn() {
|
|
NOTREACHED() << "Thread Collision";
|
|
}
|
|
|
|
static subtle::Atomic32 CurrentThread() {
|
|
const cef_platform_thread_id_t current_thread_id =
|
|
cef_get_current_platform_thread_id();
|
|
// We need to get the thread id into an atomic data type. This might be a
|
|
// truncating conversion, but any loss-of-information just increases the
|
|
// chance of a fault negative, not a false positive.
|
|
const subtle::Atomic32 atomic_thread_id =
|
|
static_cast<subtle::Atomic32>(current_thread_id);
|
|
|
|
return atomic_thread_id;
|
|
}
|
|
|
|
void ThreadCollisionWarner::EnterSelf() {
|
|
// If the active thread is 0 then I'll write the current thread ID
|
|
// if two or more threads arrive here only one will succeed to
|
|
// write on valid_thread_id_ the current thread ID.
|
|
subtle::Atomic32 current_thread_id = CurrentThread();
|
|
|
|
int previous_value = subtle::NoBarrier_CompareAndSwap(&valid_thread_id_,
|
|
0,
|
|
current_thread_id);
|
|
if (previous_value != 0 && previous_value != current_thread_id) {
|
|
// gotcha! a thread is trying to use the same class and that is
|
|
// not current thread.
|
|
asserter_->warn();
|
|
}
|
|
|
|
subtle::NoBarrier_AtomicIncrement(&counter_, 1);
|
|
}
|
|
|
|
void ThreadCollisionWarner::Enter() {
|
|
subtle::Atomic32 current_thread_id = CurrentThread();
|
|
|
|
if (subtle::NoBarrier_CompareAndSwap(&valid_thread_id_,
|
|
0,
|
|
current_thread_id) != 0) {
|
|
// gotcha! another thread is trying to use the same class.
|
|
asserter_->warn();
|
|
}
|
|
|
|
subtle::NoBarrier_AtomicIncrement(&counter_, 1);
|
|
}
|
|
|
|
void ThreadCollisionWarner::Leave() {
|
|
if (subtle::Barrier_AtomicIncrement(&counter_, -1) == 0) {
|
|
subtle::NoBarrier_Store(&valid_thread_id_, 0);
|
|
}
|
|
}
|
|
|
|
} // namespace base
|