diff options
| author | maxim <maxim@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-23 11:02:51 +0000 |
|---|---|---|
| committer | maxim <maxim@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-06-23 11:02:51 +0000 |
| commit | b10424bc82f875da5f33928b47ace9232d4cb33f (patch) | |
| tree | f2cc41ad741e7721b0c812fc822c3246435558b9 | |
| parent | b1115227b87a24137310c566f5f8a53cf182796e (diff) | |
2011-06-23 Paul Pluzhnikov <ppluzhnikov@google.com>
* resolv/res_libc.c (__res_initstamp): Declare unconditionally.
(__res_maybe_init): Avoid double-checked locking.
git-svn-id: svn://svn.eglibc.org/trunk@14311 7b3dc134-2b1b-0410-93df-9e9f96275f8d
| -rw-r--r-- | libc/ChangeLog.eglibc | 5 | ||||
| -rw-r--r-- | libc/resolv/res_libc.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index a2c275556..381baa339 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,8 @@ +2011-06-23 Paul Pluzhnikov <ppluzhnikov@google.com> + + * resolv/res_libc.c (__res_initstamp): Declare unconditionally. + (__res_maybe_init): Avoid double-checked locking. + 2011-06-21 Joseph Myers <joseph@codesourcery.com> * elf/pldd.c (argp_program_bug_address): Use REPORT_BUGS_TO. diff --git a/libc/resolv/res_libc.c b/libc/resolv/res_libc.c index 5c5b691b6..f1413163d 100644 --- a/libc/resolv/res_libc.c +++ b/libc/resolv/res_libc.c @@ -28,6 +28,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 +36,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 @@ -100,12 +100,12 @@ __res_maybe_init (res_state resp, int preinit) 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; - atomicinclock (lock); atomicinc (__res_initstamp); - atomicincunlock (lock); } + __libc_lock_unlock (lock); if (__res_initstamp != resp->_u._ext.initstamp) { if (resp->nscount > 0) __res_iclose (resp, true); |