Use the refactored version of Selectables

lib/src/sai_redis_fdb.cpp

@@ -44,9 +44,7 @@ sai_status_t internal_redis_flush_fdb_entries(
 
         swss::Selectable *sel;
 
-        int fd;
-
-        int result = s.select(&sel, &fd, GET_RESPONSE_TIMEOUT);
+        int result = s.select(&sel, GET_RESPONSE_TIMEOUT);
 
         if (result == swss::Select::OBJECT)
         {

lib/src/sai_redis_generic_get.cpp

@@ -49,10 +49,6 @@ std::string getSelectResultAsString(int result)
 
     switch (result)
     {
-        case swss::Select::FD:
-            res = "FD";
-            break;
-
         case swss::Select::ERROR:
             res = "ERROR";
             break;
@@ -198,9 +194,7 @@ sai_status_t internal_redis_generic_get(
 
         swss::Selectable *sel;
 
-        int fd;
-
-        int result = s.select(&sel, &fd, GET_RESPONSE_TIMEOUT);
+        int result = s.select(&sel, GET_RESPONSE_TIMEOUT);
 
         if (result == swss::Select::OBJECT)
         {

lib/src/sai_redis_generic_get_stats.cpp

@@ -143,9 +143,7 @@ sai_status_t internal_redis_generic_get_stats(
 
         swss::Selectable *sel;
 
-        int fd;
-
-        int result = s.select(&sel, &fd, GET_RESPONSE_TIMEOUT);
+        int result = s.select(&sel, GET_RESPONSE_TIMEOUT);
 
         if (result == swss::Select::OBJECT)
         {

lib/src/sai_redis_interfacequery.cpp

@@ -66,9 +66,7 @@ void ntf_thread()
     {
         swss::Selectable *sel;
 
-        int fd;
-
-        int result = s.select(&sel, &fd);
+        int result = s.select(&sel);
 
         if (sel == &g_redisNotificationTrheadEvent)
         {

lib/src/sai_redis_switch.cpp

@@ -35,9 +35,7 @@ sai_status_t sai_redis_internal_notify_syncd(
 
         swss::Selectable *sel;
 
-        int fd;
-
-        int result = s.select(&sel, &fd, GET_RESPONSE_TIMEOUT);
+        int result = s.select(&sel, GET_RESPONSE_TIMEOUT);
 
         if (result == swss::Select::OBJECT)
         {

syncd/syncd.cpp

@@ -3358,9 +3358,7 @@ int syncd_main(int argc, char **argv)
         {
             swss::Selectable *sel = NULL;
 
-            int fd;
-
-            int result = s.select(&sel, &fd);
+            int result = s.select(&sel);
 
             if (sel == restartQuery.get())
             {

syncd/tests.cpp

@@ -156,11 +156,10 @@ void bulk_nhgm_consumer_worker()
     swss::ConsumerTable c(&db, tableName);
     swss::Select cs;
     swss::Selectable *selectcs;
-    int tmpfd;
     int ret = 0;
 
     cs.addSelectable(&c);
-    while ((ret = cs.select(&selectcs, &tmpfd)) == swss::Select::OBJECT)
+    while ((ret = cs.select(&selectcs)) == swss::Select::OBJECT)
     {
         swss::KeyOpFieldsValuesTuple kco;
         c.pop(kco);

vslib/src/sai_vs_interfacequery.cpp

@@ -177,9 +177,7 @@ void unittestChannelThreadProc()
     {
         swss::Selectable *sel;
 
-        int fd;
-
-        int result = s.select(&sel, &fd);
+        int result = s.select(&sel);
 
         if (sel == &g_unittestChannelThreadEvent)
         {

vslib/src/sai_vs_switch.cpp

@@ -215,8 +215,7 @@ void linkmsg_thread(
             {
                 swss::Selectable *temps = NULL;
 
-                int tempfd;
-                int result = s.select(&temps, &tempfd);
+                int result = s.select(&temps);
 
                 SWSS_LOG_INFO("select ended: %d", result);
             }