Refactor poll scheduler legacy code vs. Device code

de_web_plugin_private.h

@@ -1321,7 +1321,6 @@ public Q_SLOTS:
     void handleMacDataRequest(const deCONZ::NodeEvent &event);
     void addLightNode(const deCONZ::Node *node);
     void setLightNodeStaticCapabilities(LightNode *lightNode);
-    void updatedLightNodeEndpoint(const deCONZ::NodeEvent &event);
     void nodeZombieStateChanged(const deCONZ::Node *node);
     LightNode *updateLightNode(const deCONZ::NodeEvent &event);
     LightNode *getLightNodeForAddress(const deCONZ::Address &addr, quint8 endpoint = 0);

device.cpp

@@ -229,14 +229,10 @@ void DEV_InitStateHandler(Device *device, const Event &event)
     if (event.what() == REventStateEnter)
     {
         d->zdpResult = { };
+        d->node = DEV_GetCoreNode(device->key()); // always get fresh pointer
 
         if ((event.deviceKey() & 0x00212E0000000000LLU) == 0x00212E0000000000LLU)
         {
-            if (!d->node)
-            {
-                d->node = DEV_GetCoreNode(device->key());
-            }
-
             if (d->node && d->node->isCoordinator())
             {
                 d->setState(DEV_DeadStateHandler);
@@ -1951,6 +1947,15 @@ void DEV_PollIdleStateHandler(Device *device, const Event &event)
             d->setState(DEV_PollNextStateHandler, STATE_LEVEL_POLL);
             return;
         }
+        else
+        {
+            if (event.what() == REventPoll)
+            {
+                DBG_Printf(DBG_DEV, "DEV Poll Idle nothing to poll %s/" FMT_MAC "\n", event.resource(), FMT_MAC_CAST(event.deviceKey()));
+                // notify DeviceTick to proceed
+                DEV_EnqueueEvent(device, REventPollDone);
+            }
+        }
     }
 }
 
@@ -1972,6 +1977,8 @@ void DEV_PollNextStateHandler(Device *device, const Event &event)
         if (d->pollItems.empty())
         {
             d->setState(DEV_PollIdleStateHandler, STATE_LEVEL_POLL);
+            // notify DeviceTick to proceed
+            DEV_EnqueueEvent(device, REventPollDone);
             return;
         }
 

device_tick.cpp

@@ -20,6 +20,7 @@
 #define TICK_INTERVAL_JOIN 500
 #define TICK_INTERVAL_IDLE 1000
 #define TICK_INTERVAL_IDLE_OTAU 6000
+#define TICK_INTERVAL_POLL_TIMOUT 10000
 
 extern int DEV_ApsQueueSize();
 extern bool DEV_OtauBusy();
@@ -37,6 +38,7 @@ typedef void (*DT_StateHandler)(DeviceTickPrivate *d, const Event &event);
 static void DT_StateInit(DeviceTickPrivate *d, const Event &event);
 static void DT_StateJoin(DeviceTickPrivate *d, const Event &event);
 static void DT_StateIdle(DeviceTickPrivate *d, const Event &event);
+static void DT_StatePoll(DeviceTickPrivate *d, const Event &event);
 
 class DeviceTickPrivate
 {
@@ -48,6 +50,9 @@ class DeviceTickPrivate
     QTimer *timer = nullptr;
     size_t devIter = 0;
     const DeviceContainer *devices = nullptr;
+    // for logging
+    DeviceKey curDeviceKey = 0;
+    bool curDeviceManaged = false;
 };
 
 /*! Constructor.
@@ -120,31 +125,37 @@ static void DT_StateInit(DeviceTickPrivate *d, const Event &event)
 {
     if (event.resource() == RLocal && event.what() == REventStateTimeout)
     {
-        DBG_Printf(DBG_INFO, "DEV Tick.Init: booted after %lld seconds\n", DEV_TICK_BOOT_TIME);
+        DBG_Printf(DBG_DEV, "DEV Tick.Init: booted after %ld seconds\n", (long)DEV_TICK_BOOT_TIME);
         DT_SetState(d, DT_StateIdle);
     }
 }
 
 /*! Emits REventPoll to the next device in DT_StateIdle.
  */
-static void DT_PollNextIdleDevice(DeviceTickPrivate *d)
+static bool DT_PollNextIdleDevice(DeviceTickPrivate *d)
 {
     const auto devCount = d->devices->size();
 
     if (devCount == 0)
     {
-        return;
+        return false;
     }
 
     d->devIter %= devCount;
 
     const auto &device = d->devices->at(d->devIter);
+    d->devIter++;
     Q_ASSERT(device);
+
     if (device->reachable())
     {
+        d->curDeviceKey = device->key();
+        d->curDeviceManaged = device->managed();
         emit d->q->eventNotify(Event(device->prefix(), REventPoll, 0, device->key()));
+        return true;
     }
-    d->devIter++;
+
+    return false;
 }
 
 /*! This state is active while Permit Join is disabled for normal idle operation.
@@ -165,7 +176,11 @@ static void DT_StateIdle(DeviceTickPrivate *d, const Event &event)
             int timeout = DEV_OtauBusy() ? TICK_INTERVAL_IDLE_OTAU : TICK_INTERVAL_IDLE;
             if (DA_ApsUnconfirmedRequests() < 4)
             {
-                DT_PollNextIdleDevice(d);
+                if (DT_PollNextIdleDevice(d))
+                {
+                    DT_SetState(d, DT_StatePoll);
+                    return;
+                }
             }
             DT_StartTimer(d, timeout);
         }
@@ -180,6 +195,38 @@ static void DT_StateIdle(DeviceTickPrivate *d, const Event &event)
     }
 }
 
+/*! Wait for poll state to finish either by timeout or device signaling that nothing needs to be polled.
+ */
+static void DT_StatePoll(DeviceTickPrivate *d, const Event &event)
+{
+    if (event.what() == REventPermitjoinEnabled)
+    {
+        DT_SetState(d, DT_StateJoin);
+    }
+    else if (event.resource() == RLocal)
+    {
+        if (event.what() == REventStateTimeout)
+        {
+            DT_SetState(d, DT_StateIdle);
+        }
+        else if (event.what() == REventStateEnter)
+        {
+            DBG_Printf(DBG_DEV, "DEV Tick: poll enter " FMT_MAC ", managed = %d\n", FMT_MAC_CAST(d->curDeviceKey), d->curDeviceManaged);
+            DT_StartTimer(d, TICK_INTERVAL_POLL_TIMOUT);
+        }
+        else if (event.what() == REventStateLeave)
+        {
+            DBG_Printf(DBG_DEV, "DEV Tick: poll leave " FMT_MAC "\n", FMT_MAC_CAST(d->curDeviceKey));
+            DT_StopTimer(d);
+        }
+    }
+    else if (event.resource() == RDevices && event.what() == REventPollDone)
+    {
+        DBG_Printf(DBG_DEV, "DEV Tick: poll done " FMT_MAC "\n", FMT_MAC_CAST(d->curDeviceKey));
+        DT_SetState(d, DT_StateIdle);
+    }
+}
+
 /*! Adds a joining device entry to the queue if not already present.
  */
 static void DT_RegisterJoiningDevice(DeviceTickPrivate *d, DeviceKey deviceKey, quint8 macCapabilities)
@@ -197,7 +244,7 @@ static void DT_RegisterJoiningDevice(DeviceTickPrivate *d, DeviceKey deviceKey,
         dev.deviceKey = deviceKey;
         dev.macCapabilities = macCapabilities;
         d->joinDevices.push_back(dev);
-        DBG_Printf(DBG_INFO, "DEV Tick: fast poll 0x%016llX, mac capabilities: 0x%02X\n", deviceKey, macCapabilities);
+        DBG_Printf(DBG_DEV, "DEV Tick: fast poll " FMT_MAC ", mac capabilities: 0x%02X\n", FMT_MAC_CAST(deviceKey), macCapabilities);
     }
 }
 
@@ -233,7 +280,7 @@ static void DT_StateJoin(DeviceTickPrivate *d, const Event &event)
     }
     else if (event.what() == REventDeviceAnnounce)
     {
-        DBG_Printf(DBG_INFO, "DEV Tick.Join: %s\n", event.what());
+        DBG_Printf(DBG_DEV, "DEV Tick.Join: %s\n", event.what());
         DT_RegisterJoiningDevice(d, event.deviceKey(), static_cast<quint8>(event.num()));
     }
     else if (event.resource() == RLocal)

ias_zone.cpp

@@ -714,9 +714,9 @@ void DeRestPluginPrivate::checkIasEnrollmentStatus(Sensor *sensor)
 
         if (iasState == IAS_STATE_READ)
         {
-            DBG_Printf(DBG_IAS, "[IAS ZONE] - 0x%016llX Read IAS zone state and CIE address...\n", sensor->address().ext());
+            DBG_Printf(DBG_IAS, "[IAS ZONE] - 0x%016llX Read IAS zone state, type and CIE address...\n", sensor->address().ext());
 
-            if (readAttributes(sensor, sensor->fingerPrint().endpoint, IAS_ZONE_CLUSTER_ID, {IAS_ZONE_STATE, IAS_CIE_ADDRESS}))
+            if (readAttributes(sensor, sensor->fingerPrint().endpoint, IAS_ZONE_CLUSTER_ID, {IAS_ZONE_STATE, IAS_ZONE_TYPE, IAS_CIE_ADDRESS}))
             {
                 queryTime = queryTime.addSecs(1);
                 IAS_SetState(sensor, itemIasState, IAS_STATE_WAIT_READ);

permitJoin.cpp

@@ -90,16 +90,6 @@ void DeRestPluginPrivate::permitJoinTimerFired()
                 i++;
             }
         }
-        else if ((gwPermitJoinDuration % 15) == 0) // TODO bad this needs to go
-        {
-            for (LightNode &l : nodes)
-            {
-                if (l.isAvailable() && l.modelId().isEmpty())
-                {
-                    queuePollNode(&l);
-                }
-            }
-        }
 
         updateEtag(gwConfigEtag); // update Etag so that webApp can count down permitJoin duration
     }

poll_manager.cpp

@@ -198,6 +198,13 @@ void PollManager::pollTimerFired()
     {
         pollState = StateIdle;
         timer->start(50);
+
+        // Notify the DeviceTick manager that legacy code is done polling.
+        Device *device = DEV_GetDevice(plugin->m_devices, dstAddr.ext());
+        if (device)
+        {
+            emit device->eventNotify(Event(device->prefix(), REventPollDone, 0, device->key()));
+        }
         emit done();
         return;
     }

resource.cpp

@@ -40,6 +40,7 @@ const char *REventPermitjoinDisabled = "event/permit.join.disabled";
 const char *REventPermitjoinEnabled = "event/permit.join.enabled";
 const char *REventPermitjoinRunning = "event/permit.join.running";
 const char *REventPoll = "event/poll";
+const char *REventPollDone = "event/poll.done";
 const char *REventSimpleDescriptor = "event/simple.descriptor";
 const char *REventStartTimer = "event/start.timer";
 const char *REventStateEnter = "event/state.enter";

resource.h

@@ -61,6 +61,7 @@ extern const char *REventPermitjoinEnabled;
 extern const char *REventPermitjoinDisabled;
 extern const char *REventPermitjoinRunning;
 extern const char *REventPoll;
+extern const char *REventPollDone;
 extern const char *REventDDFReload;
 extern const char *REventDDFInitRequest;
 extern const char *REventDDFInitResponse;