This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-331-g82d86f2
- From: tschwinge at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Mar 2012 10:50:23 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-331-g82d86f2
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 82d86f28445f3231f7f9e94ac6678065ab476a8e (commit)
from 2edd9a79e5967e01f9afc3ae1207159a2c53c73f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=82d86f28445f3231f7f9e94ac6678065ab476a8e
commit 82d86f28445f3231f7f9e94ac6678065ab476a8e
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Thu Mar 8 11:49:43 2012 +0100
Fix struct timespec normalization (as used in many other places).
diff --git a/ChangeLog b/ChangeLog
index 6986559..1c2c928 100644
--- 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
--- 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
--- 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
--- 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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
resolv/gai_misc.c | 4 ++--
rt/tst-cpuclock2.c | 2 +-
sysdeps/pthread/aio_misc.c | 5 ++---
4 files changed, 12 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources