[libvirt] [PATCH] virCondWaitUntil: calculate timespec correctly

2015-04-16 Thread Michael Chapman 
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 m...@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) * 100;
 
 if ((ret = pthread_cond_timedwait(c-cond, m-lock, ts)) != 0) {
 errno = ret;
-- 
2.1.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] virCondWaitUntil: calculate timespec correctly

2015-04-16 Thread Michal Privoznik 
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 m...@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) * 100;
  
  if ((ret = pthread_cond_timedwait(c-cond, m-lock, ts)) != 0) {
  errno = ret;
 

Nice catch. ACKed and pushed.

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] virCondWaitUntil: calculate timespec correctly

2015-04-16 Thread Martin Kletzander 

On Thu, Apr 16, 2015 at 03:48:25PM +0200, Martin Kletzander wrote:

On Thu, Apr 16, 2015 at 07:27:36PM +1000, 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 m...@very.puzzling.org
---
src/util/virthread.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)



Wow, we had a bug like that there since...  The introduction of that
function in commit e40438fa.  That's more than 5 years.

Good catch, ACK, I'll push this shortly.



Or not, Michal pushed it already, my mail is slowed down. :)


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) * 100;

   if ((ret = pthread_cond_timedwait(c-cond, m-lock, ts)) != 0) {
   errno = ret;
--
2.1.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list





--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] virCondWaitUntil: calculate timespec correctly

2015-04-16 Thread Martin Kletzander 

On Thu, Apr 16, 2015 at 07:27:36PM +1000, 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 m...@very.puzzling.org
---
src/util/virthread.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)



Wow, we had a bug like that there since...  The introduction of that
function in commit e40438fa.  That's more than 5 years.

Good catch, ACK, I'll push this shortly.


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) * 100;

if ((ret = pthread_cond_timedwait(c-cond, m-lock, ts)) != 0) {
errno = ret;
--
2.1.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list


signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list