25ab3228f3
CL partially auto-generated with:
git grep -l "\bassert(" | grep "\.[c|h]" | \
xargs sed -i 's/\bassert(/RTC_DCHECK(/g'
And with:
git grep -l "RTC_DCHECK(false)" | \
xargs sed -i 's/RTC_DCHECK(false)/RTC_NOTREACHED()/g'
With some manual changes to include "rtc_base/checks.h" where
needed.
A follow-up CL will remove assert() from Obj-C code as well
and remove the #include of <assert.h>.
The choice to replace with RTC_DCHECK is because assert()
is because RTC_DCHECK has similar behavior as assert()
based on NDEBUG.
This CL also contains manual changes to switch from
basic RTC_DCHECK to other (preferred) versions like
RTC_DCHECK_GT (and similar).
Bug: webrtc:6779
Change-Id: I00bed8886e03d685a2f42324e34aef2c9b7a63b0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/224846
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34442}
55 lines
1.5 KiB
C++
55 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2013 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.
|
|
*/
|
|
|
|
#include "modules/desktop_capture/linux/x_error_trap.h"
|
|
|
|
#include <stddef.h>
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
// TODO(sergeyu): This code is not thread safe. Fix it. Bug 2202.
|
|
static bool g_xserver_error_trap_enabled = false;
|
|
static int g_last_xserver_error_code = 0;
|
|
|
|
int XServerErrorHandler(Display* display, XErrorEvent* error_event) {
|
|
RTC_DCHECK(g_xserver_error_trap_enabled);
|
|
g_last_xserver_error_code = error_event->error_code;
|
|
return 0;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
XErrorTrap::XErrorTrap(Display* display)
|
|
: original_error_handler_(NULL), enabled_(true) {
|
|
RTC_DCHECK(!g_xserver_error_trap_enabled);
|
|
original_error_handler_ = XSetErrorHandler(&XServerErrorHandler);
|
|
g_xserver_error_trap_enabled = true;
|
|
g_last_xserver_error_code = 0;
|
|
}
|
|
|
|
int XErrorTrap::GetLastErrorAndDisable() {
|
|
enabled_ = false;
|
|
RTC_DCHECK(g_xserver_error_trap_enabled);
|
|
XSetErrorHandler(original_error_handler_);
|
|
g_xserver_error_trap_enabled = false;
|
|
return g_last_xserver_error_code;
|
|
}
|
|
|
|
XErrorTrap::~XErrorTrap() {
|
|
if (enabled_)
|
|
GetLastErrorAndDisable();
|
|
}
|
|
|
|
} // namespace webrtc
|