mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-31 11:35:19 +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
93 lines
2.2 KiB
C++
93 lines
2.2 KiB
C++
// Copyright (c) 2011 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/internal/cef_lock_impl.h"
|
|
|
|
#if defined(OS_WIN)
|
|
|
|
namespace base {
|
|
namespace internal {
|
|
|
|
LockImpl::LockImpl() {
|
|
// The second parameter is the spin count, for short-held locks it avoid the
|
|
// contending thread from going to sleep which helps performance greatly.
|
|
::InitializeCriticalSectionAndSpinCount(&native_handle_, 2000);
|
|
}
|
|
|
|
LockImpl::~LockImpl() {
|
|
::DeleteCriticalSection(&native_handle_);
|
|
}
|
|
|
|
bool LockImpl::Try() {
|
|
if (::TryEnterCriticalSection(&native_handle_) != FALSE) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void LockImpl::Lock() {
|
|
::EnterCriticalSection(&native_handle_);
|
|
}
|
|
|
|
void LockImpl::Unlock() {
|
|
::LeaveCriticalSection(&native_handle_);
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace base
|
|
|
|
#elif defined(OS_POSIX)
|
|
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
|
|
#include "include/base/cef_logging.h"
|
|
|
|
namespace base {
|
|
namespace internal {
|
|
|
|
LockImpl::LockImpl() {
|
|
#ifndef NDEBUG
|
|
// In debug, setup attributes for lock error checking.
|
|
pthread_mutexattr_t mta;
|
|
int rv = pthread_mutexattr_init(&mta);
|
|
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
|
|
rv = pthread_mutexattr_settype(&mta, PTHREAD_MUTEX_ERRORCHECK);
|
|
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
|
|
rv = pthread_mutex_init(&native_handle_, &mta);
|
|
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
|
|
rv = pthread_mutexattr_destroy(&mta);
|
|
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
|
|
#else
|
|
// In release, go with the default lock attributes.
|
|
pthread_mutex_init(&native_handle_, NULL);
|
|
#endif
|
|
}
|
|
|
|
LockImpl::~LockImpl() {
|
|
int rv = pthread_mutex_destroy(&native_handle_);
|
|
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
|
|
}
|
|
|
|
bool LockImpl::Try() {
|
|
int rv = pthread_mutex_trylock(&native_handle_);
|
|
DCHECK(rv == 0 || rv == EBUSY) << ". " << strerror(rv);
|
|
return rv == 0;
|
|
}
|
|
|
|
void LockImpl::Lock() {
|
|
int rv = pthread_mutex_lock(&native_handle_);
|
|
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
|
|
}
|
|
|
|
void LockImpl::Unlock() {
|
|
int rv = pthread_mutex_unlock(&native_handle_);
|
|
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace base
|
|
|
|
#endif // defined(OS_POSIX)
|