Skip to content
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

Calculate and write the realtime factor #44

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Calculate and write the realtime factor #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions mars.orogen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ task_context "Task" do

output_port('time', 'double')
output_port('simulated_time', '/base/Time')
output_port('system_time', '/base/Time')
output_port('loop_time_real', 'double')
output_port('loop_time_sim', 'double')
output_port('realtime_factor', 'double')

port_driven 'control_action'

Expand Down
13 changes: 12 additions & 1 deletion tasks/Task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,18 @@ void Task::receiveData(
const data_broker::DataPackage& package,
int id)
{
_simulated_time.write(base::Time::fromMilliseconds(simulatorInterface->getTime()));
base::Time simtime = base::Time::fromMilliseconds(simulatorInterface->getTime());
base::Time systemtime = base::Time::now();
_simulated_time.write(simtime);
_system_time.write(systemtime);
double realdiff = (systemtime - lastSimUpdateSystemTime).toSeconds();
double simdiff = (simtime - lastSimUpdateSimTime).toSeconds();
_loop_time_real.write(realdiff);
_loop_time_sim.write(simdiff);
_realtime_factor.write(simdiff/realdiff);

lastSimUpdateSimTime = simtime;
lastSimUpdateSystemTime = systemtime;
}

bool Task::setGravity_internal(::base::Vector3d const & value){
Expand Down
3 changes: 3 additions & 0 deletions tasks/Task.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ namespace mars {
pthread_t thread_info;
static lib_manager::LibManager* libManager;

base::Time lastSimUpdateSimTime;
base::Time lastSimUpdateSystemTime;

mars::interfaces::PluginInterface* multisimPlugin;

int getOptionCount(const std::vector<Option>& options);
Expand Down