vhost: combine select with sleep
authorHuawei Xie <huawei.xie@intel.com>
Fri, 6 Mar 2015 05:52:27 +0000 (13:52 +0800)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Mon, 9 Mar 2015 11:46:46 +0000 (12:46 +0100)
combine sleep into select when there is no file descriptors to be monitored.

Signed-off-by: Huawei Xie <huawei.xie@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
lib/librte_vhost/vhost_user/fd_man.c

index 63ac4df..a89b6fe 100644 (file)
@@ -211,25 +211,26 @@ fdset_event_dispatch(struct fdset *pfdset)
        void *dat;
        int fd;
        int remove1, remove2;
+       int ret;
 
        if (pfdset == NULL)
                return;
 
        while (1) {
+               struct timeval tv;
+               tv.tv_sec = 1;
+               tv.tv_usec = 0;
                FD_ZERO(&rfds);
                FD_ZERO(&wfds);
                pthread_mutex_lock(&pfdset->fd_mutex);
 
                maxfds = fdset_fill(&rfds, &wfds, pfdset);
-               if (maxfds == -1) {
-                       pthread_mutex_unlock(&pfdset->fd_mutex);
-                       sleep(1);
-                       continue;
-               }
 
                pthread_mutex_unlock(&pfdset->fd_mutex);
 
-               select(maxfds + 1, &rfds, &wfds, NULL, NULL);
+               ret = select(maxfds + 1, &rfds, &wfds, NULL, &tv);
+               if (ret <= 0)
+                       continue;
 
                for (i = 0; i < num; i++) {
                        remove1 = remove2 = 0;