Fix struct timespec normalization (as used in many other places).

diff --git a/ChangeLog b/ChangeLog
index 6986559..1c2c928 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-08  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * resolv/gai_misc.c (handle_requests): Fix struct timespec
+       normalization.
+       * rt/tst-cpuclock2.c (test_nanosleep): Likewise.
+       * sysdeps/pthread/aio_misc.c (handle_fildes_io): Likewise.
+
 2012-03-08  Ulrich Drepper  <drepper@gmail.com>
 
        * stdio-common/tst-fphex.c: Various cleanups.  The macros cannot

diff --git a/resolv/gai_misc.c b/resolv/gai_misc.c
index 33ebd54..35f1133 100644 (file)
--- a/resolv/gai_misc.c
+++ b/resolv/gai_misc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
 
@@ -364,7 +364,7 @@ handle_requests (void *arg)
          gettimeofday (&now, NULL);
          wakeup_time.tv_sec = now.tv_sec + optim.gai_idle_time;
          wakeup_time.tv_nsec = now.tv_usec * 1000;
-         if (wakeup_time.tv_nsec > 1000000000)
+         if (wakeup_time.tv_nsec >= 1000000000)
            {
              wakeup_time.tv_nsec -= 1000000000;
              ++wakeup_time.tv_sec;

diff --git a/rt/tst-cpuclock2.c b/rt/tst-cpuclock2.c
index e3545f2..9a74eb0 100644 (file)
--- a/rt/tst-cpuclock2.c
+++ b/rt/tst-cpuclock2.c
@@ -110,7 +110,7 @@ test_nanosleep (clockid_t clock, const char *which,
   struct timespec sleeptimeabs = sleeptime;
   sleeptimeabs.tv_sec += after.tv_sec;
   sleeptimeabs.tv_nsec += after.tv_nsec;
-  while (sleeptimeabs.tv_nsec > 1000000000)
+  while (sleeptimeabs.tv_nsec >= 1000000000)
     {
       ++sleeptimeabs.tv_sec;
       sleeptimeabs.tv_nsec -= 1000000000;

diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c
index 601feb8..d5bb95b 100644 (file)
--- a/sysdeps/pthread/aio_misc.c
+++ b/sysdeps/pthread/aio_misc.c
@@ -1,6 +1,5 @@
 /* Handle general operations.
-   Copyright (C) 1997-2001, 2003, 2004, 2006, 2007, 2009, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -635,7 +634,7 @@ handle_fildes_io (void *arg)
          gettimeofday (&now, NULL);
          wakeup_time.tv_sec = now.tv_sec + optim.aio_idle_time;
          wakeup_time.tv_nsec = now.tv_usec * 1000;
-         if (wakeup_time.tv_nsec > 1000000000)
+         if (wakeup_time.tv_nsec >= 1000000000)
            {
              wakeup_time.tv_nsec -= 1000000000;
              ++wakeup_time.tv_sec;