diff --git a/cfgmgr/buffermgrd.cpp b/cfgmgr/buffermgrd.cpp index e9224b5f51a..ac59b87bd85 100644 --- 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 index 989099f9155..8d7c2ef2fc3 100644 --- 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 index add128dd20e..2ba33f9dffe 100644 --- 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 index 9dfedb6c1b6..33103e8b312 100644 --- 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 index 6394b6b8706..4081607cdc4 100644 --- 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 index 3a4abaa9b00..d5a54f8fee3 100644 --- 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 index 0878a429433..82ffba58afc 100644 --- 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 index 9153216c67c..3694ba8cbf5 100644 --- 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 index db83dcfa178..0eb693ae7a3 100644 --- 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 index 3c9fe381e97..a167cce62b9 100644 --- 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 index df4bf2fdcb1..f76e0dfc47f 100644 --- 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 index 970c7aef139..1564ff75fa9 100644 --- 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 index 8f8114a5b20..79ca1e1e570 100644 --- 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 index 3ed2fb4dced..2ac52ebf72d 100644 --- 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)