[dpdk-dev] [PATCH] lib/librte_vhost: use loop instead of goto
Huawei Xie
huawei.xie at intel.com
Fri Mar 6 06:52:43 CET 2015
This patch reorder the code a bit to use loop instead of goto.
Besides, remove abudant check 'fd != -1'.
Signed-off-by: Huawei Xie <huawei.xie at intel.com>
---
lib/librte_vhost/vhost_user/fd_man.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/lib/librte_vhost/vhost_user/fd_man.c b/lib/librte_vhost/vhost_user/fd_man.c
index a89b6fe..831c9c1 100644
--- a/lib/librte_vhost/vhost_user/fd_man.c
+++ b/lib/librte_vhost/vhost_user/fd_man.c
@@ -172,23 +172,19 @@ fdset_del(struct fdset *pfdset, int fd)
if (pfdset == NULL || fd == -1)
return;
-again:
- pthread_mutex_lock(&pfdset->fd_mutex);
+ do {
+ pthread_mutex_lock(&pfdset->fd_mutex);
- i = fdset_find_fd(pfdset, fd);
- if (i != -1 && fd != -1) {
- /* busy indicates r/wcb is executing! */
- if (pfdset->fd[i].busy == 1) {
- pthread_mutex_unlock(&pfdset->fd_mutex);
- goto again;
+ i = fdset_find_fd(pfdset, fd);
+ if (i != -1 && pfdset->fd[i].busy == 0) {
+ /* busy indicates r/wcb is executing! */
+ pfdset->fd[i].fd = -1;
+ pfdset->fd[i].rcb = pfdset->fd[i].wcb = NULL;
+ pfdset->num--;
+ i = -1;
}
-
- pfdset->fd[i].fd = -1;
- pfdset->fd[i].rcb = pfdset->fd[i].wcb = NULL;
- pfdset->num--;
- }
-
- pthread_mutex_unlock(&pfdset->fd_mutex);
+ pthread_mutex_unlock(&pfdset->fd_mutex);
+ } while (i != -1);
}
/**
--
1.8.1.4
More information about the dev
mailing list