8000 TRI_ASSERT Log Stream by maierlars · Pull Request #14676 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

8000 TRI_ASSERT Log Stream #14676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 26, 2021
Merged

TRI_ASSERT Log Stream #14676

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f940707
First version for TRI_ASSERT logger stream.
Aug 23, 2021
b0815e4
Fixing compilation and wrong bool expression.
Aug 23, 2021
a04948f
Remove stream wrapper.
Aug 24, 2021
f2b9bba
Fix nonmaintainer compile.
Aug 24, 2021
cbedc26
Fix non-maintainer compile for real.
Aug 24, 2021
10beb03
Merge remote-tracking branch 'origin/devel' into feature/tri-assert-l…
Aug 24, 2021
4c59a20
Made noop operator& noexcept and const.
Aug 24, 2021
b0db1f7
Added pretty function macros.
Aug 24, 2021
e5fbecc
Merge branch 'devel' of github.com:arangodb/arangodb into feature/tri…
jsteemann Aug 25, 2021
83121f8
Do not allocate std::ostringstream on the stack.
Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove stream wrapper.
  • Loading branch information
maierlars committed Aug 24, 2021
commit a04948fb224a047d5374d06f1bae917f6b0c543e
20 changes: 7 additions & 13 deletions lib/Basics/debugging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,22 +209,16 @@ struct NoOpStream {
}
};

struct StringStreamWrapper {
template <typename T>
auto operator<<(T const& v) -> StringStreamWrapper& {
_stream << v;
return *this;
}

std::stringstream _stream;
};

struct AssertionLogger {
void operator&(StringStreamWrapper const& wrapper) {
std::string message = wrapper._stream.str();
void operator&(std::ostringstream const& stream) const {
std::string message = stream.str();
arangodb::CrashHandler::assertionFailure(file, line, function, expr,
message.empty() ? nullptr : message.c_str());
}
// can be removed in C++20 because of LWG 1203
void operator&(std::ostream const& stream) const {
operator&(static_cast<std::ostringstream const&>(stream));
}
void operator&(NoOpStream const&) {}
const char* file;
int line;
Expand All @@ -245,7 +239,7 @@ struct AssertionLogger {
(ADB_LIKELY(expr)) \
? (void)nullptr \
: ::arangodb::debug::AssertionLogger{__FILE__, __LINE__, __FUNCTION__, #expr} & \
(::arangodb::debug::StringStreamWrapper{})
std::ostringstream{}

#else

Expand Down
0