Use the refactored version of Selectables (sonic-net#470)

pavel-shirshov · web-flow · commit a97f3cee75ba · 2018-04-16T13:30:58.000-07:00
* Remove deprecated parameter from select()

* Convert Selectables to new interface
diff --git a/cfgmgr/buffermgrd.cpp b/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));
diff --git a/cfgmgr/intfmgrd.cpp b/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));
diff --git a/cfgmgr/vlanmgrd.cpp b/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));
diff --git a/fpmsyncd/fpmlink.cpp b/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;
diff --git a/fpmsyncd/fpmlink.h b/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
     {
diff --git a/fpmsyncd/fpmsyncd.cpp b/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");
             }
diff --git a/intfsyncd/intfsyncd.cpp b/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)
diff --git a/neighsyncd/neighsyncd.cpp b/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)
diff --git a/orchagent/orch.h b/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;
diff --git a/orchagent/orchdaemon.cpp b/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)
         {
diff --git a/portsyncd/portsyncd.cpp b/portsyncd/portsyncd.cpp
@@ -96,8 +96,8 @@ int main(int argc, char **argv)
         while (true)
         {
             Selectable *temps;
-            int tempfd, ret;
-            ret = s.select(&temps, &tempfd, 1);
+            int ret;
+            ret = s.select(&temps, 1);
 
             if (ret == Select::ERROR)
             {
diff --git a/teamsyncd/teamsync.cpp b/teamsyncd/teamsync.cpp
@@ -203,22 +203,12 @@ int TeamSync::TeamPortSync::teamdHandler(struct team_handle *team, void *arg,
     return ((TeamSync::TeamPortSync *)arg)->onChange();
 }
 
-void TeamSync::TeamPortSync::addFd(fd_set *fd)
+int TeamSync::TeamPortSync::getFd()
 {
-    FD_SET(team_get_event_fd(m_team), fd);
+    return team_get_event_fd(m_team);
 }
 
-bool TeamSync::TeamPortSync::isMe(fd_set *fd)
-{
-    return FD_ISSET(team_get_event_fd(m_team), fd);
-}
-
-int TeamSync::TeamPortSync::readCache()
-{
-    return NODATA;
-}
-
-void TeamSync::TeamPortSync::readMe()
+void TeamSync::TeamPortSync::readData()
 {
     team_handle_events(m_team);
 }
diff --git a/teamsyncd/teamsync.h b/teamsyncd/teamsync.h
@@ -32,10 +32,8 @@ class TeamSync : public NetMsg
                      ProducerStateTable *lagMemberTable);
         ~TeamPortSync();
 
-        virtual void addFd(fd_set *fd);
-        virtual bool isMe(fd_set *fd);
-        virtual int readCache();
-        virtual void readMe();
+        int getFd() override;
+        void readData() override;
 
     protected:
         int onChange();
diff --git a/teamsyncd/teamsyncd.cpp b/teamsyncd/teamsyncd.cpp
@@ -34,8 +34,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)

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,9 @@ int main(int argc, char **argv)`
`96`	`96`	`while (true)`
`97`	`97`	`{`
`98`	`98`	`Selectable *sel;`
`99`		`- int fd, ret;`
	`99`	`+ int ret;`
`100`	`100`
`101`		`- ret = s.select(&sel, &fd, SELECT_TIMEOUT);`
	`101`	`+ ret = s.select(&sel, SELECT_TIMEOUT);`
`102`	`102`	`if (ret == Select::ERROR)`
`103`	`103`	`{`
`104`	`104`	`SWSS_LOG_NOTICE("Error: %s!", strerror(errno));`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,9 @@ int main(int argc, char **argv)`
`65`	`65`	`while (true)`
`66`	`66`	`{`
`67`	`67`	`Selectable *sel;`
`68`		`- int fd, ret;`
	`68`	`+ int ret;`
`69`	`69`
`70`		`- ret = s.select(&sel, &fd, SELECT_TIMEOUT);`
	`70`	`+ ret = s.select(&sel, SELECT_TIMEOUT);`
`71`	`71`	`if (ret == Select::ERROR)`
`72`	`72`	`{`
`73`	`73`	`SWSS_LOG_NOTICE("Error: %s!", strerror(errno));`
Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,9 @@ int main(int argc, char **argv)`
`84`	`84`	`while (true)`
`85`	`85`	`{`
`86`	`86`	`Selectable *sel;`
`87`		`- int fd, ret;`
	`87`	`+ int ret;`
`88`	`88`
`89`		`- ret = s.select(&sel, &fd, SELECT_TIMEOUT);`
	`89`	`+ ret = s.select(&sel, SELECT_TIMEOUT);`
`90`	`90`	`if (ret == Select::ERROR)`
`91`	`91`	`{`
`92`	`92`	`SWSS_LOG_NOTICE("Error: %s!", strerror(errno));`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,8 @@ int main(int argc, char **argv)`
`33`	`33`	`while (true)`
`34`	`34`	`{`
`35`	`35`	`Selectable *temps;`
`36`		`- int tempfd;`
`37`		`- /* Reading FPM messages forever (and calling "readMe" to read them) */`
`38`		`- s.select(&temps, &tempfd);`
	`36`	`+ /* Reading FPM messages forever (and calling "readData" to read them) */`
	`37`	`+ s.select(&temps);`
`39`	`38`	`pipeline.flush();`
`40`	`39`	`SWSS_LOG_DEBUG("Pipeline flushed");`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ int main(int argc, char **argv)`
`33`	`33`	`while (true)`
`34`	`34`	`{`
`35`	`35`	`Selectable *temps;`
`36`		`- int tempfd;`
`37`		`- s.select(&temps, &tempfd);`
	`36`	`+ s.select(&temps);`
`38`	`37`	`}`
`39`	`38`	`}`
`40`	`39`	`catch (const std::exception& e)`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ int main(int argc, char **argv)`
`32`	`32`	`while (true)`
`33`	`33`	`{`
`34`	`34`	`Selectable *temps;`
`35`		`- int tempfd;`
`36`		`- s.select(&temps, &tempfd);`
	`35`	`+ s.select(&temps);`
`37`	`36`	`}`
`38`	`37`	`}`
`39`	`38`	`catch (const std::exception& e)`
Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,9 @@ void OrchDaemon::start()`
`223`	`223`	`while (true)`
`224`	`224`	`{`
`225`	`225`	`Selectable *s;`
`226`		`- int fd, ret;`
	`226`	`+ int ret;`
`227`	`227`
`228`		`- ret = m_select->select(&s, &fd, SELECT_TIMEOUT);`
	`228`	`+ ret = m_select->select(&s, SELECT_TIMEOUT);`
`229`	`229`
`230`	`230`	`if (ret == Select::ERROR)`
`231`	`231`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ int main(int argc, char **argv)`
`96`	`96`	`while (true)`
`97`	`97`	`{`
`98`	`98`	`Selectable *temps;`
`99`		`- int tempfd, ret;`
`100`		`- ret = s.select(&temps, &tempfd, 1);`
	`99`	`+ int ret;`
	`100`	`+ ret = s.select(&temps, 1);`
`101`	`101`
`102`	`102`	`if (ret == Select::ERROR)`
`103`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -203,22 +203,12 @@ int TeamSync::TeamPortSync::teamdHandler(struct team_handle team, void arg,`
`203`	`203`	`return ((TeamSync::TeamPortSync *)arg)->onChange();`
`204`	`204`	`}`
`205`	`205`
`206`		`-void TeamSync::TeamPortSync::addFd(fd_set *fd)`
	`206`	`+int TeamSync::TeamPortSync::getFd()`
`207`	`207`	`{`
`208`		`- FD_SET(team_get_event_fd(m_team), fd);`
	`208`	`+ return team_get_event_fd(m_team);`
`209`	`209`	`}`
`210`	`210`
`211`		`-bool TeamSync::TeamPortSync::isMe(fd_set *fd)`
`212`		`-{`
`213`		`- return FD_ISSET(team_get_event_fd(m_team), fd);`
`214`		`-}`
`215`		`-`
`216`		`-int TeamSync::TeamPortSync::readCache()`
`217`		`-{`
`218`		`- return NODATA;`
`219`		`-}`
`220`		`-`
`221`		`-void TeamSync::TeamPortSync::readMe()`
	`211`	`+void TeamSync::TeamPortSync::readData()`
`222`	`212`	`{`
`223`	`213`	`team_handle_events(m_team);`
`224`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ int main(int argc, char **argv)`
`34`	`34`	`while (true)`
`35`	`35`	`{`
`36`	`36`	`Selectable *temps;`
`37`		`- int tempfd;`
`38`		`- s.select(&temps, &tempfd);`
	`37`	`+ s.select(&temps);`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`	`catch (const std::exception& e)`