mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-15 14:22:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

replay: fix seekTo issue (#29422)

Browse Source 
* fix seekTo issue

* remove extra space
old-commit-hash: e8e03197ca73e98c152b94f64060ee57f88d2911
This commit is contained in:
Dean Lee
2023-08-17 02:01:14 +08:00
committed by GitHub
parent deb8257322
commit accd5f471b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/replay/replay.cc
+3 -2
View File
@@ -18,7 +18,7 @@ Replay::Replay(QString route, QStringList allow, QStringList block, QStringList
for (const auto &it : services) {
uint16_t which = event_struct.getFieldByName(it.name).getProto().getDiscriminantValue();
if ((which == cereal::Event::Which::UI_DEBUG || which == cereal::Event::Which::USER_FLAG) &&
!(flags & REPLAY_FLAG_ALL_SERVICES) &&
!(flags & REPLAY_FLAG_ALL_SERVICES) &&
!allow.contains(it.name)) {
continue;
}
@@ -307,7 +307,8 @@ void Replay::mergeSegments(const SegmentMap::iterator &begin, const SegmentMap::
updateEvents([&]() {
events_.swap(new_events_);
segments_merged_ = segments_need_merge;
return true;
// Do not wake up the stream thread if the current segment has not been merged.
return isSegmentMerged(current_segment_) || (segments_.count(current_segment_) == 0);
});
}
}
tools/replay/tests/test_replay.cc
+2 -2
View File
@@ -147,7 +147,7 @@ TEST_CASE("Route") {
// helper class for unit tests
class TestReplay : public Replay {
public:
TestReplay(const QString &route, uint8_t flags = REPLAY_FLAG_NO_FILE_CACHE) : Replay(route, {}, {}, {}, nullptr, flags) {}
TestReplay(const QString &route, uint32_t flags = REPLAY_FLAG_NO_FILE_CACHE | REPLAY_FLAG_NO_VIPC) : Replay(route, {}, {}, {}, nullptr, flags) {}
void test_seek();
void testSeekTo(int seek_to);
};
@@ -191,7 +191,7 @@ void TestReplay::test_seek() {
QEventLoop loop;
std::thread thread = std::thread([&]() {
for (int i = 0; i < 10; ++i) {
testSeekTo(util::random_int(0, 1 * 60));
testSeekTo(util::random_int(0, 2 * 60));
}
loop.quit();
});