fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 02:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

ServiceClient<>: proper destruction of CallState objects via execution relaying

Browse Source
This commit is contained in:
Pavel Kirienko
2015-05-16 21:12:15 +03:00
parent 81533eda46
commit 9ba6050af1
2 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/node/uc_service_client.cpp
+10 -3
View File
@@ -11,11 +11,18 @@ namespace uavcan
*/
void ServiceClientBase::CallState::handleDeadline(MonotonicTime)
{
UAVCAN_ASSERT(id_.isValid());
UAVCAN_TRACE("ServiceClient", "Timeout from nid=%d, tid=%d, dtname=%s",
UAVCAN_TRACE("ServiceClient::CallState", "Timeout from nid=%d, tid=%d, dtname=%s",
int(id_.server_node_id.get()), int(id_.transfer_id.get()),
(owner_.data_type_descriptor_ == NULL) ? "???" : owner_.data_type_descriptor_->getFullName());
owner_.handleTimeout(id_);
/*
* What we're doing here is relaying execution from this call stack to a different one.
* We need it because call registry cannot release memory from this callback, because this will destroy the
* object method of which we're executing now.
*/
UAVCAN_ASSERT(timed_out_ == false);
timed_out_ = true;
owner_.generateDeadlineImmediately();
UAVCAN_TRACE("ServiceClient::CallState", "Relaying execution to the owner's handler via timer callback");
}
/*