Imported Upstream version 17.05

[deb_dpdk.git] / lib / librte_vhost / fd_man.c

diff --git a/lib/librte_vhost/fd_man.c b/lib/librte_vhost/fd_man.c
index 8a075da..2ceacc9 100644 (file)
--- a/lib/librte_vhost/fd_man.c
+++ b/lib/librte_vhost/fd_man.c
@@ -65,17 +65,12 @@ fdset_move(struct fdset *pfdset, int dst, int src)
        pfdset->rwfds[dst] = pfdset->rwfds[src];
 }
 
-/*
- * Find deleted fd entries and remove them
- */
 static void
-fdset_shrink(struct fdset *pfdset)
+fdset_shrink_nolock(struct fdset *pfdset)
 {
        int i;
        int last_valid_idx = get_last_valid_idx(pfdset, pfdset->num - 1);
 
-       pthread_mutex_lock(&pfdset->fd_mutex);
-
        for (i = 0; i < last_valid_idx; i++) {
                if (pfdset->fd[i].fd != -1)
                        continue;
@@ -84,7 +79,16 @@ fdset_shrink(struct fdset *pfdset)
                last_valid_idx = get_last_valid_idx(pfdset, last_valid_idx - 1);
        }
        pfdset->num = last_valid_idx + 1;
+}
 
+/*
+ * Find deleted fd entries and remove them
+ */
+static void
+fdset_shrink(struct fdset *pfdset)
+{
+       pthread_mutex_lock(&pfdset->fd_mutex);
+       fdset_shrink_nolock(pfdset);
        pthread_mutex_unlock(&pfdset->fd_mutex);
 }
 
@@ -151,8 +155,12 @@ fdset_add(struct fdset *pfdset, int fd, fd_cb rcb, fd_cb wcb, void *dat)
        pthread_mutex_lock(&pfdset->fd_mutex);
        i = pfdset->num < MAX_FDS ? pfdset->num++ : -1;
        if (i == -1) {
-               pthread_mutex_unlock(&pfdset->fd_mutex);
-               return -2;
+               fdset_shrink_nolock(pfdset);
+               i = pfdset->num < MAX_FDS ? pfdset->num++ : -1;
+               if (i == -1) {
+                       pthread_mutex_unlock(&pfdset->fd_mutex);
+                       return -2;
+               }
        }
 
        fdset_add_fd(pfdset, i, fd, rcb, wcb, dat);
@@ -202,8 +210,8 @@ fdset_del(struct fdset *pfdset, int fd)
  * will wait until the flag is reset to zero(which indicates the callback is
  * finished), then it could free the context after fdset_del.
  */
-void
-fdset_event_dispatch(struct fdset *pfdset)
+void *
+fdset_event_dispatch(void *arg)
 {
        int i;
        struct pollfd *pfd;
@@ -213,9 +221,10 @@ fdset_event_dispatch(struct fdset *pfdset)
        int fd, numfds;
        int remove1, remove2;
        int need_shrink;
+       struct fdset *pfdset = arg;
 
        if (pfdset == NULL)
-               return;
+               return NULL;
 
        while (1) {
 
@@ -286,4 +295,6 @@ fdset_event_dispatch(struct fdset *pfdset)
                if (need_shrink)
                        fdset_shrink(pfdset);
        }
+
+       return NULL;
 }