Add IsSelectResultValid to LayerImplSelect

project-chip · Jan 20, 2022 · 3cdd00a · 3cdd00a
1 parent 332f97c
commit 3cdd00a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/system/SystemLayerImplSelect.cpp b/src/system/SystemLayerImplSelect.cpp
@@ -373,7 +373,7 @@ void LayerImplSelect::HandleEvents()
 {
     assertChipStackLockedByCurrentThread();
 
-    if (mSelectResult < 0)
+    if (!IsSelectResultValid())
     {
         ChipLogError(DeviceLayer, "select failed: %s\n", ErrorStr(CHIP_ERROR_POSIX(errno)));
         return;

diff --git a/src/system/SystemLayerImplSelect.h b/src/system/SystemLayerImplSelect.h
@@ -75,6 +75,9 @@ class LayerImplSelect : public LayerSocketsLoop
     void HandleTimerComplete(TimerList::Node * timer);
 #endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH
 
+    // Expose the result of WaitForEvents() for non-blocking socket implementations.
+    bool IsSelectResultValid() const { return mSelectResult >= 0; }
+
 protected:
     static SocketEvents SocketEventsFromFDs(int socket, const fd_set & readfds, const fd_set & writefds, const fd_set & exceptfds);