diff options
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/Makefile | 3 | ||||
| -rw-r--r-- | nscd/connections.c | 3 | ||||
| -rw-r--r-- | nscd/nscd-client.h | 1 | ||||
| -rw-r--r-- | nscd/nscd.h | 4 | ||||
| -rw-r--r-- | nscd/nscd_helper.c | 7 |
5 files changed, 12 insertions, 6 deletions
diff --git a/nscd/Makefile b/nscd/Makefile index 5b3529267a..9be82317d4 100644 --- a/nscd/Makefile +++ b/nscd/Makefile @@ -31,7 +31,8 @@ vpath %.c ../locale/programs nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \ getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm2_r \ - dbg_log nscd_conf nscd_stat cache mem xmalloc xstrdup + dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \ + xmalloc xstrdup ifeq ($(have-thread-library),yes) diff --git a/nscd/connections.c b/nscd/connections.c index 552d554295..2ca6f69cf2 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -770,6 +770,9 @@ nscd_run (void *p) time_t next_prune = run_prune ? time (NULL) + CACHE_PRUNE_INTERVAL : 0; static unsigned long int nready; + if (my_number < lastdb) + setup_thread (&dbs[my_number]); + conn.fd = sock; conn.events = POLLRDNORM; diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h index 708f62d6aa..02a57787b5 100644 --- a/nscd/nscd-client.h +++ b/nscd/nscd-client.h @@ -180,6 +180,7 @@ struct database_pers_head int version; int header_size; int gc_cycle; + int nscd_certainly_running; volatile time_t timestamp; size_t module; diff --git a/nscd/nscd.h b/nscd/nscd.h index 889588cd9a..910fba33be 100644 --- a/nscd/nscd.h +++ b/nscd/nscd.h @@ -195,4 +195,8 @@ extern void readdhstbyaddrv6 (struct database_dyn *db, struct hashentry *he, extern void *mempool_alloc (struct database_dyn *db, size_t len); extern void gc (struct database_dyn *db); + +/* nscd_setup_thread.c */ +extern void setup_thread (struct database_dyn *db); + #endif /* nscd.h */ diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c index 95661b6ff3..01c4c81848 100644 --- a/nscd/nscd_helper.c +++ b/nscd/nscd_helper.c @@ -234,11 +234,8 @@ __nscd_get_map_ref (request_type type, const char *name, { /* If not mapped or timestamp not updated, request new map. */ if (cur == NULL - // XXX The following syscalls increases the cost of the entire - // XXX lookup by a factor of 5 but unfortunately there is not - // XXX much we can do except hoping we get a userlevel - // XXX implementation soon. - || cur->head->timestamp + MAPPING_TIMEOUT < time (NULL)) + || (cur->head->nscd_certainly_running == 0 + && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))) cur = get_mapping (type, name, &mapptr->mapped); if (__builtin_expect (cur != NO_MAPPING, 1)) |