Use the refactored version of Selectables (#470)

* Remove deprecated parameter from select()

* Convert Selectables to new interface

Author: pavel-shirshov

cfgmgr/buffermgrd.cpp

@@ -96,9 +96,9 @@ int main(int argc, char **argv)
         while (true)
         {
             Selectable *sel;
-            int fd, ret;
+            int ret;
 
-            ret = s.select(&sel, &fd, SELECT_TIMEOUT);
+            ret = s.select(&sel, SELECT_TIMEOUT);
             if (ret == Select::ERROR)
             {
                 SWSS_LOG_NOTICE("Error: %s!", strerror(errno));

cfgmgr/intfmgrd.cpp

@@ -65,9 +65,9 @@ int main(int argc, char **argv)
         while (true)
         {
             Selectable *sel;
-            int fd, ret;
+            int ret;
 
-            ret = s.select(&sel, &fd, SELECT_TIMEOUT);
+            ret = s.select(&sel, SELECT_TIMEOUT);
             if (ret == Select::ERROR)
             {
                 SWSS_LOG_NOTICE("Error: %s!", strerror(errno));

cfgmgr/vlanmgrd.cpp

@@ -84,9 +84,9 @@ int main(int argc, char **argv)
         while (true)
         {
             Selectable *sel;
-            int fd, ret;
+            int ret;
 
-            ret = s.select(&sel, &fd, SELECT_TIMEOUT);
+            ret = s.select(&sel, SELECT_TIMEOUT);
             if (ret == Select::ERROR)
             {
                 SWSS_LOG_NOTICE("Error: %s!", strerror(errno));

fpmsyncd/fpmlink.cpp

@@ -81,23 +81,12 @@ void FpmLink::accept()
     SWSS_LOG_INFO("New connection accepted from: %s\n", inet_ntoa(client_addr.sin_addr));
 }
 
-void FpmLink::addFd(fd_set *fd)
+int FpmLink::getFd()
 {
-    FD_SET(m_connection_socket, fd);
+    return m_connection_socket;
 }
 
-bool FpmLink::isMe(fd_set *fd)
-{
-    return FD_ISSET(m_connection_socket, fd);
-}
-
-int FpmLink::readCache()
-{
-    /* FPM doesn't have any caching */
-    return NODATA;
-}
-
-void FpmLink::readMe()
+void FpmLink::readData()
 {
     fpm_msg_hdr_t *hdr;
     size_t msg_len;

fpmsyncd/fpmlink.h

@@ -25,11 +25,8 @@ class FpmLink : public Selectable {
     /* Wait for connection (blocking) */
     void accept();
 
-    virtual void addFd(fd_set *fd);
-    virtual bool isMe(fd_set *fd);
-    virtual int readCache();
-    virtual void readMe();
-
+    int getFd() override;
+    void readData() override;
     /* readMe throws FpmConnectionClosedException when connection is lost */
     class FpmConnectionClosedException : public std::exception
     {

fpmsyncd/fpmsyncd.cpp

@@ -33,9 +33,8 @@ int main(int argc, char **argv)
             while (true)
             {
                 Selectable *temps;
-                int tempfd;
-                /* Reading FPM messages forever (and calling "readMe" to read them) */
-                s.select(&temps, &tempfd);
+                /* Reading FPM messages forever (and calling "readData" to read them) */
+                s.select(&temps);
                 pipeline.flush();
                 SWSS_LOG_DEBUG("Pipeline flushed");
             }

intfsyncd/intfsyncd.cpp

@@ -33,8 +33,7 @@ int main(int argc, char **argv)
             while (true)
             {
                 Selectable *temps;
-                int tempfd;
-                s.select(&temps, &tempfd);
+                s.select(&temps);
             }
         }
         catch (const std::exception& e)

neighsyncd/neighsyncd.cpp

@@ -32,8 +32,7 @@ int main(int argc, char **argv)
             while (true)
             {
                 Selectable *temps;
-                int tempfd;
-                s.select(&temps, &tempfd);
+                s.select(&temps);
             }
         }
         catch (const std::exception& e)

orchagent/orch.h

@@ -70,10 +70,11 @@ class Executor : public Selectable
     virtual ~Executor() { delete m_selectable; }
 
     // Decorating Selectable
-    virtual void addFd(fd_set *fd) { return m_selectable->addFd(fd); }
-    virtual bool isMe(fd_set *fd) { return m_selectable->isMe(fd); }
-    virtual int readCache() { return m_selectable->readCache(); }
-    virtual void readMe() { return m_selectable->readMe(); }
+    int getFd() override { return m_selectable->getFd(); }
+    void readData() override { m_selectable->readData(); }
+    bool hasCachedData() override { return m_selectable->hasCachedData(); }
+    bool initializedWithData() override { return m_selectable->initializedWithData(); }
+    void updateAfterRead() override { m_selectable->updateAfterRead(); }
 
     // Disable copying
     Executor(const Executor&) = delete;

orchagent/orchdaemon.cpp

@@ -223,9 +223,9 @@ void OrchDaemon::start()
     while (true)
     {
         Selectable *s;
-        int fd, ret;
+        int ret;
 
-        ret = m_select->select(&s, &fd, SELECT_TIMEOUT);
+        ret = m_select->select(&s, SELECT_TIMEOUT);
 
         if (ret == Select::ERROR)
         {