We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition. Alternative solutions: * Check if we already have defined e.g. CHECK, and don't define them in that case. This makes us depend on include order in Chromium, which is not acceptable. * Don't allow using the macros in WebRTC headers. Error prone since if someone adds it there by mistake it may compile fine, but later break if a header in added or order is changed in Chromium. That will be confusing and hard to enforce. * Ensure that headers that are included by an embedder don't include our macros. This would require some heavy refactoring to be maintainable and enforcable. * Changes in Chromium for this is obviously not an option. BUG=chromium:468375 NOTRY=true Review URL: https://codereview.webrtc.org/1335923002 Cr-Commit-Position: refs/heads/master@{#9964}
42 lines
1.3 KiB
C++
42 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 2012 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.
|
|
*/
|
|
|
|
// General note: return values for the various pthread synchronization APIs
|
|
// are explicitly ignored here. In Chromium, the same thing is done for release.
|
|
// However, in debugging, failure in these APIs are logged.
|
|
// TODO(henrike): add logging when pthread synchronization APIs are failing.
|
|
|
|
#include "webrtc/system_wrappers/source/critical_section_posix.h"
|
|
|
|
namespace webrtc {
|
|
|
|
CriticalSectionPosix::CriticalSectionPosix() {
|
|
pthread_mutexattr_t attr;
|
|
(void) pthread_mutexattr_init(&attr);
|
|
(void) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
|
|
(void) pthread_mutex_init(&mutex_, &attr);
|
|
}
|
|
|
|
CriticalSectionPosix::~CriticalSectionPosix() {
|
|
(void) pthread_mutex_destroy(&mutex_);
|
|
}
|
|
|
|
void
|
|
CriticalSectionPosix::Enter() {
|
|
(void) pthread_mutex_lock(&mutex_);
|
|
}
|
|
|
|
void
|
|
CriticalSectionPosix::Leave() {
|
|
(void) pthread_mutex_unlock(&mutex_);
|
|
}
|
|
|
|
} // namespace webrtc
|