
Summary: A few changes related to logging: - prepend `Scudo` to the error messages so that users can identify that we reported an error; - replace a couple of `Report` calls in the RSS check code with `dieWithMessage`/`Print`, mark a condition as `UNLIKELY` in the process; - change some messages so that they all look more or less the same. This includes the `CHECK` message; - adapt a couple of tests with the new strings. A couple of side notes: this results in a few 1-line-blocks, for which I left brackets. There doesn't seem to be any style guide for that, I can remove them if need be. I didn't use `SanitizerToolName` in the strings, but directly `Scudo` because we are the only users, I could change that too. Reviewers: alekseyshl, flowerhack Reviewed By: alekseyshl Subscribers: mgorny, delcypher, llvm-commits, #sanitizers Differential Revision: https://reviews.llvm.org/D44171 llvm-svn: 326901
43 lines
1.3 KiB
C++
43 lines
1.3 KiB
C++
//===-- scudo_termination.cpp -----------------------------------*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
///
|
|
/// This file contains bare-bones termination functions to replace the
|
|
/// __sanitizer ones, in order to avoid any potential abuse of the callbacks
|
|
/// functionality.
|
|
///
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "scudo_utils.h"
|
|
|
|
#include "sanitizer_common/sanitizer_common.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
bool AddDieCallback(DieCallbackType Callback) { return true; }
|
|
|
|
bool RemoveDieCallback(DieCallbackType Callback) { return true; }
|
|
|
|
void SetUserDieCallback(DieCallbackType Callback) {}
|
|
|
|
void NORETURN Die() {
|
|
if (common_flags()->abort_on_error)
|
|
Abort();
|
|
internal__exit(common_flags()->exitcode);
|
|
}
|
|
|
|
void SetCheckFailedCallback(CheckFailedCallbackType callback) {}
|
|
|
|
void NORETURN CheckFailed(const char *File, int Line, const char *Condition,
|
|
u64 Value1, u64 Value2) {
|
|
__scudo::dieWithMessage("CHECK failed at %s:%d %s (%lld, %lld)\n",
|
|
File, Line, Condition, Value1, Value2);
|
|
}
|
|
|
|
} // namespace __sanitizer
|