Updated to fedora-glibc-20050428T0846

This commit is contained in:
Jakub Jelinek 2005-04-28 09:10:12 +00:00
parent 484a05dfdb
commit 7647ac7978
3 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2005-04-27 Ulrich Drepper <drepper@redhat.com>
* nscd/connections.c (nscd_run): Use time() value in prune_cache
call, not timeout value, since the latter might be from another clock.
2005-04-27 Jakub Jelinek <jakub@redhat.com>
* elf/rtld.c (dl_main): Call _dl_init_linuxthreads_paths

View File

@ -1,5 +1,5 @@
# This file is updated automatically by Makefile.
glibc-branch := fedora
glibc-base := HEAD
fedora-sync-date := 2005-04-27 19:12 UTC
fedora-sync-tag := fedora-glibc-20050427T1912
fedora-sync-date := 2005-04-28 08:46 UTC
fedora-sync-tag := fedora-glibc-20050428T0846

View File

@ -1176,8 +1176,7 @@ handle_request: request received (Version = %d)"), req.version);
/* The pthread_cond_timedwait() call timed out. It is time
to clean up the cache. */
assert (my_number < lastdb);
prune_cache (&dbs[my_number],
prune_ts.tv_sec + (prune_ts.tv_nsec >= 500000000));
prune_cache (&dbs[my_number], time (NULL));
if (clock_gettime (timeout_clock, &prune_ts) == -1)
/* Should never happen. */