diff mbox

[dpdk-dev] lib/librte_vhost: combine select with sleep

Message ID 1425621147-14904-1-git-send-email-huawei.xie@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Huawei Xie March 6, 2015, 5:52 a.m. UTC 
  combine sleep into select when there is no file descriptors to be monitored.

Signed-off-by: Huawei Xie <huawei.xie@intel.com>
---
 lib/librte_vhost/vhost_user/fd_man.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Comments

Ananyev, Konstantin March 6, 2015, 10:04 a.m. UTC | #1 
> -----Original Message-----
> From: Xie, Huawei
> Sent: Friday, March 06, 2015 5:52 AM
> To: dev@dpdk.org
> Cc: Ananyev, Konstantin; Xie, Huawei
> Subject: [PATCH] lib/librte_vhost: combine select with sleep
> 
> 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 | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/librte_vhost/vhost_user/fd_man.c b/lib/librte_vhost/vhost_user/fd_man.c
> index 63ac4df..a89b6fe 100644
> --- a/lib/librte_vhost/vhost_user/fd_man.c
> +++ b/lib/librte_vhost/vhost_user/fd_man.c
> @@ -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;
> --
> 1.8.1.4
Thomas Monjalon March 9, 2015, 8:26 a.m. UTC | #2 
> > 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>

Applied, thanks
diff mbox

Patch

diff --git a/lib/librte_vhost/vhost_user/fd_man.c b/lib/librte_vhost/vhost_user/fd_man.c
index 63ac4df..a89b6fe 100644
--- a/lib/librte_vhost/vhost_user/fd_man.c
+++ b/lib/librte_vhost/vhost_user/fd_man.c
@@ -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;