Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: webrtc/system_wrappers/source/event_timer_posix.cc

Issue 1335923002: Add RTC_ prefix to (D)CHECKs and related macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/system_wrappers/source/critical_section_posix.cc ('k') | webrtc/system_wrappers/source/file_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/system_wrappers/source/event_timer_posix.cc
diff --git a/webrtc/system_wrappers/source/event_timer_posix.cc b/webrtc/system_wrappers/source/event_timer_posix.cc
index b5ed4612c1f01f904162d49cfbc64b53f45a9874..99eebcb70a5c87849242aa70649663c1b89bab7b 100644
--- a/webrtc/system_wrappers/source/event_timer_posix.cc
+++ b/webrtc/system_wrappers/source/event_timer_posix.cc
@@ -60,7 +60,7 @@ EventTimerPosix::~EventTimerPosix() {
// TODO(pbos): Make this void.
bool EventTimerPosix::Set() {
- CHECK_EQ(0, pthread_mutex_lock(&mutex_));
+ RTC_CHECK_EQ(0, pthread_mutex_lock(&mutex_));
event_set_ = true;
pthread_cond_signal(&cond_);
pthread_mutex_unlock(&mutex_);
@@ -69,7 +69,7 @@ bool EventTimerPosix::Set() {
EventTypeWrapper EventTimerPosix::Wait(unsigned long timeout) {
int ret_val = 0;
- CHECK_EQ(0, pthread_mutex_lock(&mutex_));
+ RTC_CHECK_EQ(0, pthread_mutex_lock(&mutex_));
if (!event_set_) {
if (WEBRTC_EVENT_INFINITE != timeout) {
@@ -103,7 +103,7 @@ EventTypeWrapper EventTimerPosix::Wait(unsigned long timeout) {
}
}
- DCHECK(ret_val == 0 || ret_val == ETIMEDOUT);
+ RTC_DCHECK(ret_val == 0 || ret_val == ETIMEDOUT);
// Reset and signal if set, regardless of why the thread woke up.
if (event_set_) {
@@ -117,12 +117,12 @@ EventTypeWrapper EventTimerPosix::Wait(unsigned long timeout) {
EventTypeWrapper EventTimerPosix::Wait(timespec* end_at) {
int ret_val = 0;
- CHECK_EQ(0, pthread_mutex_lock(&mutex_));
+ RTC_CHECK_EQ(0, pthread_mutex_lock(&mutex_));
while (ret_val == 0 && !event_set_)
ret_val = pthread_cond_timedwait(&cond_, &mutex_, end_at);
- DCHECK(ret_val == 0 || ret_val == ETIMEDOUT);
+ RTC_DCHECK(ret_val == 0 || ret_val == ETIMEDOUT);
// Reset and signal if set, regardless of why the thread woke up.
if (event_set_) {
« no previous file with comments | « webrtc/system_wrappers/source/critical_section_posix.cc ('k') | webrtc/system_wrappers/source/file_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698