[libvirt] [PATCH] virCondWaitUntil: calculate timespec correctly

Michal Privoznik mprivozn at redhat.com
Thu Apr 16 13:43:05 UTC 2015


On 16.04.2015 11:27, Michael Chapman wrote:
> ts.tv_nsec was off by a factor of 1000, making timeouts less than a
> second in the future often expiring immediately.
> 
> Signed-off-by: Michael Chapman <mike at very.puzzling.org>
> ---
>  src/util/virthread.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/util/virthread.c b/src/util/virthread.c
> index c2a9e7f..6c49515 100644
> --- a/src/util/virthread.c
> +++ b/src/util/virthread.c
> @@ -164,7 +164,7 @@ int virCondWaitUntil(virCondPtr c, virMutexPtr m, unsigned long long whenms)
>      struct timespec ts;
>  
>      ts.tv_sec = whenms / 1000;
> -    ts.tv_nsec = (whenms % 1000) * 1000;
> +    ts.tv_nsec = (whenms % 1000) * 1000000;
>  
>      if ((ret = pthread_cond_timedwait(&c->cond, &m->lock, &ts)) != 0) {
>          errno = ret;
> 

Nice catch. ACKed and pushed.

Michal




More information about the libvir-list mailing list