* nscd/nscd_helper.c (open_socket): Minor size optimization.

This commit is contained in:
Ulrich Drepper 2007-02-02 15:53:48 +00:00
parent 73f50d5a69
commit f2ccf9839e
2 changed files with 12 additions and 10 deletions

View File

@ -1,10 +1,12 @@
2007-02-02 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd_helper.c (open_socket): Minor size optimization.
2007-02-02 Jakub Jelinek <jakub@redhat.com> 2007-02-02 Jakub Jelinek <jakub@redhat.com>
* include/locale.h (__uselocale): Add libc_hidden_proto. * include/locale.h (__uselocale): Add libc_hidden_proto.
* locale/uselocale.c (__uselocale): Add libc_hidden_def. * locale/uselocale.c (__uselocale): Add libc_hidden_def.
2007-02-02 Jakub Jelinek <jakub@redhat.com>
* nscd/nscd_helper.c (open_socket): Use __gettimeofday instead of * nscd/nscd_helper.c (open_socket): Use __gettimeofday instead of
gettimeofday. gettimeofday.

View File

@ -127,6 +127,8 @@ open_socket (request_type type, const char *key, size_t keylen)
bool first_try = true; bool first_try = true;
struct timeval tvend; struct timeval tvend;
/* Fake initializing tvend. */
asm ("" : "=m" (tvend));
while (1) while (1)
{ {
#ifndef MSG_NOSIGNAL #ifndef MSG_NOSIGNAL
@ -145,20 +147,18 @@ open_socket (request_type type, const char *key, size_t keylen)
/* The daemon is busy wait for it. */ /* The daemon is busy wait for it. */
int to; int to;
struct timeval now;
(void) __gettimeofday (&now, NULL);
if (first_try) if (first_try)
{ {
(void) __gettimeofday (&tvend, NULL); tvend.tv_usec = now.tv_usec;
tvend.tv_sec += 5; tvend.tv_sec = now.tv_sec + 5;
to = 5 * 1000; to = 5 * 1000;
first_try = false; first_try = false;
} }
else else
{ to = ((tvend.tv_sec - now.tv_sec) * 1000
struct timeval now; + (tvend.tv_usec - now.tv_usec) / 1000);
(void) __gettimeofday (&now, NULL);
to = ((tvend.tv_sec - now.tv_sec) * 1000
+ (tvend.tv_usec - now.tv_usec) / 1000);
}
struct pollfd fds[1]; struct pollfd fds[1];
fds[0].fd = sock; fds[0].fd = sock;