d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: use loop instead of goto

Browse Source 
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@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
Huawei Xie 2015-03-06 13:52:43 +08:00 committed by Thomas Monjalon
parent 31ff0c6a45
commit aee87dd706
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/librte_vhost/vhost_user/fd_man.c
View File

@ -172,23 +172,19 @@ fdset_del(struct fdset *pfdset, int fd)
if (pfdset == NULL || fd == -1) if (pfdset == NULL || fd == -1)
return; return;
again: do {
pthread_mutex_lock(&pfdset->fd_mutex); pthread_mutex_lock(&pfdset->fd_mutex);
i = fdset_find_fd(pfdset, fd); i = fdset_find_fd(pfdset, fd);
if (i != -1 && fd != -1) { if (i != -1 && pfdset->fd[i].busy == 0) {
/* busy indicates r/wcb is executing! */ /* busy indicates r/wcb is executing! */
if (pfdset->fd[i].busy == 1) { pfdset->fd[i].fd = -1;
pthread_mutex_unlock(&pfdset->fd_mutex); pfdset->fd[i].rcb = pfdset->fd[i].wcb = NULL;
goto again; pfdset->num--;
i = -1;
} }
pthread_mutex_unlock(&pfdset->fd_mutex);
pfdset->fd[i].fd = -1; } while (i != -1);
pfdset->fd[i].rcb = pfdset->fd[i].wcb = NULL;
pfdset->num--;
}
pthread_mutex_unlock(&pfdset->fd_mutex);
} }
/** /**