| From 588d936b9aa65e7cc8b1eb2cad1d209087db43a9 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Thu, 31 Dec 2015 15:10:33 -0800 |
| Subject: [PATCH 20/24] eglibc: cherry-picked from |
| |
| http://www.eglibc.org/archives/patches/msg00772.html |
| |
| Not yet merged into glibc |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| resolv/res_libc.c | 14 +++++++++++++- |
| 1 file changed, 13 insertions(+), 1 deletion(-) |
| |
| diff --git a/resolv/res_libc.c b/resolv/res_libc.c |
| index a8394e0..981ac7c 100644 |
| --- a/resolv/res_libc.c |
| +++ b/resolv/res_libc.c |
| @@ -18,6 +18,7 @@ |
| #include <atomic.h> |
| #include <limits.h> |
| #include <sys/types.h> |
| +#include <sys/stat.h> |
| #include <netinet/in.h> |
| #include <arpa/nameser.h> |
| #include <resolv.h> |
| @@ -28,6 +29,7 @@ |
| out) since res_init() should go into libc.so but the rest of that |
| file should not. */ |
| |
| +__libc_lock_define_initialized (static, lock); |
| extern unsigned long long int __res_initstamp attribute_hidden; |
| /* We have atomic increment operations on 64-bit platforms. */ |
| #if __WORDSIZE == 64 |
| @@ -35,7 +37,6 @@ extern unsigned long long int __res_initstamp attribute_hidden; |
| # define atomicincunlock(lock) (void) 0 |
| # define atomicinc(var) catomic_increment (&(var)) |
| #else |
| -__libc_lock_define_initialized (static, lock); |
| # define atomicinclock(lock) __libc_lock_lock (lock) |
| # define atomicincunlock(lock) __libc_lock_unlock (lock) |
| # define atomicinc(var) ++var |
| @@ -94,7 +95,18 @@ res_init(void) { |
| int |
| __res_maybe_init (res_state resp, int preinit) |
| { |
| + static time_t last_mtime; |
| + struct stat statbuf; |
| + int ret; |
| + |
| if (resp->options & RES_INIT) { |
| + ret = stat (_PATH_RESCONF, &statbuf); |
| + __libc_lock_lock (lock); |
| + if ((ret == 0) && (last_mtime != statbuf.st_mtime)) { |
| + last_mtime = statbuf.st_mtime; |
| + atomicinc (__res_initstamp); |
| + } |
| + __libc_lock_unlock (lock); |
| if (__res_initstamp != resp->_u._ext.initstamp) { |
| if (resp->nscount > 0) |
| __res_iclose (resp, true); |
| -- |
| 2.6.4 |
| |