Skip to content

Fix log playback GUI display (backport #2611) #3012

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 4 commits into from
Aug 6, 2025
Merged

Fix log playback GUI display (backport #2611) #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f07c481
Fix log playback GUI display (#2611)
azeey Sep 12, 2024
d1d9440
Backport changes
arjo129 Aug 5, 2025
57a18b8
Style
arjo129 Aug 5, 2025
1d04b4c
Update test expectations
arjo129 Aug 6, 2025
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
7 changes: 2 additions & 5 deletions src/Server_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,7 @@ TEST_P(ServerFixture, GZ_UTILS_TEST_DISABLED_ON_WIN32(ServerConfigLogRecord))

EXPECT_EQ(0u, *server.IterationCount());
EXPECT_EQ(3u, *server.EntityCount());
// Only the log record system is needed and therefore loaded.
EXPECT_EQ(1u, *server.SystemCount());
EXPECT_EQ(4u, *server.SystemCount());

EXPECT_TRUE(serverConfig.LogRecordTopics().empty());
serverConfig.AddLogRecordTopic("test_topic1");
Expand Down Expand Up @@ -482,9 +481,7 @@ TEST_P(ServerFixture,
sim::Server server(serverConfig);
EXPECT_EQ(0u, *server.IterationCount());
EXPECT_EQ(3u, *server.EntityCount());

// Only the log record system is needed and therefore loaded.
EXPECT_EQ(1u, *server.SystemCount());
EXPECT_EQ(4u, *server.SystemCount());
}

EXPECT_FALSE(common::exists(logFile));
Expand Down
7 changes: 4 additions & 3 deletions src/SimulationRunner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1587,8 +1587,6 @@ void SimulationRunner::CreateEntities(const sdf::World &_world)
this->entityCompMgr.ProcessRemoveEntityRequests();
this->entityCompMgr.ClearRemovedComponents();

this->LoadLoggingPlugins(this->serverConfig);

// Load any additional plugins from the Server Configuration
this->LoadServerPlugins(this->serverConfig.Plugins());

Expand All @@ -1601,7 +1599,10 @@ void SimulationRunner::CreateEntities(const sdf::World &_world)
auto plugins = gz::sim::loadPluginInfo(isPlayback);
this->LoadServerPlugins(plugins);
}

// Load logging plugins after all server plugins so that necessary
// plugins such as SceneBroadcaster are loaded first. This might be
// a bug or an assumption made in the logging plugins.
this->LoadLoggingPlugins(this->serverConfig);
// Store the initial state of the ECM;
this->initialEntityCompMgr.CopyFrom(this->entityCompMgr);

Expand Down