Skip to content

Commit

Permalink
Remove waits after callbacks are added
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <methylDragon@gmail.com>
  • Loading branch information
methylDragon committed Nov 11, 2022
1 parent b7480f8 commit d3b6c94
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions fuse_core/src/async_motion_model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,19 @@ void AsyncMotionModel::graphCallback(Graph::ConstSharedPtr graph)
auto callback = std::make_shared<CallbackWrapper<void>>(
std::bind(&AsyncMotionModel::onGraphUpdate, this, std::move(graph))
);
auto result = callback->getFuture();
// auto result = callback->getFuture(); // TODO(CH3): Circle back if we need this again
callback_queue_->addCallback(callback);
result.wait();
// result.wait();
}

void AsyncMotionModel::start()
{
auto callback = std::make_shared<CallbackWrapper<void>>(
std::bind(&AsyncMotionModel::onStart, this)
);
auto result = callback->getFuture();
// auto result = callback->getFuture(); // TODO(CH3): Circle back if we need this again
callback_queue_->addCallback(callback);
result.wait();
// result.wait();
}

void AsyncMotionModel::stop()
Expand All @@ -126,9 +126,9 @@ void AsyncMotionModel::stop()
auto callback = std::make_shared<CallbackWrapper<void>>(
std::bind(&AsyncMotionModel::onStop, this)
);
auto result = callback->getFuture();
// auto result = callback->getFuture(); // TODO(CH3): Circle back if we need this again
callback_queue_->addCallback(callback);
result.wait();
// result.wait();
}
else
{
Expand Down
8 changes: 4 additions & 4 deletions fuse_core/src/async_publisher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@ void AsyncPublisher::notify(Transaction::ConstSharedPtr transaction, Graph::Cons
void AsyncPublisher::start()
{
auto callback = std::make_shared<CallbackWrapper<void>>(std::bind(&AsyncPublisher::onStart, this));
auto result = callback->getFuture();
// auto result = callback->getFuture(); // TODO(CH3): Circle back if we need this again
callback_queue_->addCallback(callback);
result.wait();
// result.wait();
}

void AsyncPublisher::stop()
{
if (node_->get_node_base_interface()->get_context()->is_valid())
{
auto callback = std::make_shared<CallbackWrapper<void>>(std::bind(&AsyncPublisher::onStop, this));
auto result = callback->getFuture();
// auto result = callback->getFuture(); // TODO(CH3): Circle back if we need this again
callback_queue_->addCallback(callback);
result.wait();
// result.wait();
}
else
{
Expand Down
8 changes: 4 additions & 4 deletions fuse_core/src/async_sensor_model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ void AsyncSensorModel::start()
auto callback = std::make_shared<CallbackWrapper<void>>(
std::bind(&AsyncSensorModel::onStart, this)
);
auto result = callback->getFuture();
// auto result = callback->getFuture(); // TODO(CH3): Circle back if we need this again
callback_queue_->addCallback(callback);
result.wait();
// result.wait();
}

void AsyncSensorModel::stop()
Expand All @@ -116,9 +116,9 @@ void AsyncSensorModel::stop()
auto callback = std::make_shared<CallbackWrapper<void>>(
std::bind(&AsyncSensorModel::onStop, this)
);
auto result = callback->getFuture();
// auto result = callback->getFuture(); // TODO(CH3): Circle back if we need this again
callback_queue_->addCallback(callback);
result.wait();
// result.wait();
}
else
{
Expand Down

0 comments on commit d3b6c94

Please sign in to comment.