Skip to content
This repository was archived by the owner on Aug 30, 2022. It is now read-only.

Fix deadlock if steady_clock::now() returns the same value twice #132

Merged
merged 2 commits into from
Sep 18, 2018
Merged

Fix deadlock if steady_clock::now() returns the same value twice #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f883686
Fix deadlock if steady_clock::now() returns the same value twice
tudor Sep 15, 2018
2ff6607
fix typo
tudor Sep 17, 2018
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
6 changes: 6 additions & 0 deletions src/jaegertracing/Span.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@ void Span::FinishWithOptions(
return;
}
_duration = finishTimeSteady - _startTimeSteady;
if (_duration <= SteadyClock::duration()) {
// Enforce minimum duration of 1 tick (1ns on Linux),
// so isFinished() returns true
_duration = SteadyClock::duration(1);
}

tracer = _tracer;

std::copy(finishSpanOptions.log_records.begin(),
Expand Down