ETM-Schurig
/
nymea-zigbee
mirror of https://github.com/nymea/nymea-zigbee
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Parallelize initializing the node descriptor.

parallelize-node-init
Michael Zanetti 2022-02-18 18:09:17 +01:00
parent bfb1ab56f2
commit cd6795da52
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libnymea-zigbee/zigbeenode.cpp
View File

@ -176,7 +176,7 @@ void ZigbeeNode::startInitialization()
{ {
setState(StateInitializing); setState(StateInitializing);
/* Node initialisation steps (sequentially) /* Node initialisation steps
* - Node descriptor * - Node descriptor
* - Power descriptor * - Power descriptor
* - Active endpoints * - Active endpoints
@ -187,6 +187,8 @@ void ZigbeeNode::startInitialization()
*/ */
initNodeDescriptor(); initNodeDescriptor();
initPowerDescriptor();
initEndpoints();
} }
ZigbeeReply *ZigbeeNode::removeAllBindings() ZigbeeReply *ZigbeeNode::removeAllBindings()
@ -266,20 +268,19 @@ ZigbeeReply *ZigbeeNode::readBindingTableEntries()
void ZigbeeNode::initNodeDescriptor() void ZigbeeNode::initNodeDescriptor()
{ {
qCDebug(dcZigbeeNode()) << "Request node descriptor from" << this; qCDebug(dcZigbeeNode()) << "Requesting node descriptor from" << this;
ZigbeeDeviceObjectReply *reply = deviceObject()->requestNodeDescriptor(); ZigbeeDeviceObjectReply *reply = deviceObject()->requestNodeDescriptor();
connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply](){ connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply](){
if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) { if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read node descriptor" << reply->error(); qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read node descriptor" << reply->error();
m_requestRetry++; m_requestRetry++;
if (m_requestRetry < m_requestRetriesMax) { if (m_requestRetry < m_requestRetriesMax) {
qCDebug(dcZigbeeNode()) << "Retry to request node descriptor" << m_requestRetry << "/" << m_requestRetriesMax; qCDebug(dcZigbeeNode()) << "Retrying to request node descriptor" << m_requestRetry << "/" << m_requestRetriesMax;
QTimer::singleShot(500, this, [=](){ initNodeDescriptor(); }); QTimer::singleShot(500, this, [=](){ initNodeDescriptor(); });
} else { } else {
qCWarning(dcZigbeeNode()) << "Failed to read node descriptor from" << this << "after" << m_requestRetriesMax << "attempts."; qCWarning(dcZigbeeNode()) << "Failed to read node descriptor from" << this << "after" << m_requestRetriesMax << "attempts.";
m_requestRetry = 0; m_requestRetry = 0;
qCWarning(dcZigbeeNode()) << this << "is out of spec. A device must implement the node descriptor. Continue anyways with the power decriptor..."; qCWarning(dcZigbeeNode()) << this << "is out of spec. A device must implement the node descriptor. Continue anyways with the power decriptor...";
initPowerDescriptor();
} }
return; return;
} }
@ -289,27 +290,23 @@ void ZigbeeNode::initNodeDescriptor()
qCDebug(dcZigbeeNode()) << m_nodeDescriptor; qCDebug(dcZigbeeNode()) << m_nodeDescriptor;
m_nodeDescriptorAvailable = true; m_nodeDescriptorAvailable = true;
m_requestRetry = 0; m_requestRetry = 0;
// Continue with the power descriptor
initPowerDescriptor();
}); });
} }
void ZigbeeNode::initPowerDescriptor() void ZigbeeNode::initPowerDescriptor()
{ {
qCDebug(dcZigbeeNode()) << "Request power descriptor from" << this; qCDebug(dcZigbeeNode()) << "Requesting power descriptor from" << this;
ZigbeeDeviceObjectReply *reply = deviceObject()->requestPowerDescriptor(); ZigbeeDeviceObjectReply *reply = deviceObject()->requestPowerDescriptor();
connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply](){ connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply](){
if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) { if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read power descriptor" << reply->error(); qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read power descriptor" << reply->error();
if (m_requestRetry < m_requestRetriesMax) { if (m_requestRetry < m_requestRetriesMax) {
m_requestRetry++; m_requestRetry++;
qCDebug(dcZigbeeNode()) << "Retry to request power descriptor from" << this << m_requestRetry << "/" << m_requestRetriesMax << "attempts."; qCDebug(dcZigbeeNode()) << "Retrying to request power descriptor from" << this << m_requestRetry << "/" << m_requestRetriesMax << "attempts.";
QTimer::singleShot(500, this, [=](){ initPowerDescriptor(); }); QTimer::singleShot(500, this, [=](){ initPowerDescriptor(); });
} else { } else {
qCWarning(dcZigbeeNode()) << "Failed to read power descriptor from" << this << "after" << m_requestRetriesMax << "attempts. Giving up reading power descriptor."; qCWarning(dcZigbeeNode()) << "Failed to read power descriptor from" << this << "after" << m_requestRetriesMax << "attempts. Giving up reading power descriptor.";
qCWarning(dcZigbeeNode()) << this << "is out of spec. A device must implement the power descriptor. Continue anyways with the endpoint initialization..."; qCWarning(dcZigbeeNode()) << this << "is out of spec. A device must implement the power descriptor. Continue anyways with the endpoint initialization...";
initEndpoints();
} }
return; return;
} }
@ -323,22 +320,19 @@ void ZigbeeNode::initPowerDescriptor()
qCDebug(dcZigbeeNode()) << m_powerDescriptor; qCDebug(dcZigbeeNode()) << m_powerDescriptor;
m_powerDescriptorAvailable = true; m_powerDescriptorAvailable = true;
m_requestRetry = 0; m_requestRetry = 0;
// Continue with endpoint fetching
initEndpoints();
}); });
} }
void ZigbeeNode::initEndpoints() void ZigbeeNode::initEndpoints()
{ {
qCDebug(dcZigbeeNode()) << "Request active endpoints from" << this; qCDebug(dcZigbeeNode()) << "Requesting active endpoints from" << this;
ZigbeeDeviceObjectReply *reply = deviceObject()->requestActiveEndpoints(); ZigbeeDeviceObjectReply *reply = deviceObject()->requestActiveEndpoints();
connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply](){ connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply](){
if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) { if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read active endpoints" << reply->error(); qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read active endpoints" << reply->error();
if (m_requestRetry < m_requestRetriesMax) { if (m_requestRetry < m_requestRetriesMax) {
m_requestRetry++; m_requestRetry++;
qCDebug(dcZigbeeNode()) << "Retry to request active endpoints from" << this << m_requestRetry << "/" << m_requestRetriesMax << "attempts."; qCDebug(dcZigbeeNode()) << "Retrying to request active endpoints from" << this << m_requestRetry << "/" << m_requestRetriesMax << "attempts.";
QTimer::singleShot(500, this, [=](){ initEndpoints(); }); QTimer::singleShot(500, this, [=](){ initEndpoints(); });
} else { } else {
qCWarning(dcZigbeeNode()) << "Failed to read active endpoints from" << this << "after" << m_requestRetriesMax << "attempts. Giving up reading endpoints."; qCWarning(dcZigbeeNode()) << "Failed to read active endpoints from" << this << "after" << m_requestRetriesMax << "attempts. Giving up reading endpoints.";
@ -381,14 +375,14 @@ void ZigbeeNode::initEndpoints()
void ZigbeeNode::initEndpoint(quint8 endpointId) void ZigbeeNode::initEndpoint(quint8 endpointId)
{ {
qCDebug(dcZigbeeNode()) << "Read simple descriptor of endpoint" << ZigbeeUtils::convertByteToHexString(endpointId); qCDebug(dcZigbeeNode()) << "Reading simple descriptor of endpoint" << ZigbeeUtils::convertByteToHexString(endpointId);
ZigbeeDeviceObjectReply *reply = deviceObject()->requestSimpleDescriptor(endpointId); ZigbeeDeviceObjectReply *reply = deviceObject()->requestSimpleDescriptor(endpointId);
connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply, endpointId](){ connect(reply, &ZigbeeDeviceObjectReply::finished, this, [this, reply, endpointId](){
if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) { if (reply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read simple descriptor for endpoint" << endpointId << reply->error(); qCWarning(dcZigbeeNode()) << "Error occured during initialization of" << this << "Failed to read simple descriptor for endpoint" << endpointId << reply->error();
if (m_requestRetry < m_requestRetriesMax) { if (m_requestRetry < m_requestRetriesMax) {
m_requestRetry++; m_requestRetry++;
qCDebug(dcZigbeeNode()) << "Retry to request simple descriptor from" << this << ZigbeeUtils::convertByteToHexString(endpointId) << m_requestRetry << "/" << m_requestRetriesMax << "attempts."; qCDebug(dcZigbeeNode()) << "Retrying to request simple descriptor from" << this << ZigbeeUtils::convertByteToHexString(endpointId) << m_requestRetry << "/" << m_requestRetriesMax << "attempts.";
QTimer::singleShot(500, this, [=](){ initEndpoint(endpointId); }); QTimer::singleShot(500, this, [=](){ initEndpoint(endpointId); });
} else { } else {
qCWarning(dcZigbeeNode()) << "Failed to read simple descriptor from" << this << ZigbeeUtils::convertByteToHexString(endpointId) << "after" << m_requestRetriesMax << "attempts. Giving up initializing endpoint" << endpointId; qCWarning(dcZigbeeNode()) << "Failed to read simple descriptor from" << this << ZigbeeUtils::convertByteToHexString(endpointId) << "after" << m_requestRetriesMax << "attempts. Giving up initializing endpoint" << endpointId;