diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nscd/grpcache.c | 10 | ||||
| -rw-r--r-- | nscd/pwdcache.c | 12 |
3 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 682a38b354..8fcfae681a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-09-12 Ulrich Drepper <drepper@redhat.com> + + * nscd/pwdcache.c (cache_addpw): Sync also negative results to disk. + * nscd/grpcache.c (cache_addgr): Likewise. + * nscd/hstcache.c (cache_addhst): Likewise. + 2004-09-11 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/i386/init-first.c (init1) [! SHARED]: diff --git a/nscd/grpcache.c b/nscd/grpcache.c index d07693f1a4..bf4a225edd 100644 --- a/nscd/grpcache.c +++ b/nscd/grpcache.c @@ -128,6 +128,16 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req, /* Copy the key data. */ memcpy (dataset->strdata, key, req->key_len); + /* If necessary, we also propagate the data to disk. */ + if (db->persistent) + { + // XXX async OK? + uintptr_t pval = (uintptr_t) dataset & ~pagesize_m1; + msync ((void *) pval, + ((uintptr_t) dataset & pagesize_m1) + + sizeof (struct dataset) + req->key_len, MS_ASYNC); + } + /* Now get the lock to safely insert the records. */ pthread_rwlock_rdlock (&db->lock); diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c index 2354b6d78a..93049bab12 100644 --- a/nscd/pwdcache.c +++ b/nscd/pwdcache.c @@ -135,6 +135,16 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, /* Copy the key data. */ char *key_copy = memcpy (dataset->strdata, key, req->key_len); + /* If necessary, we also propagate the data to disk. */ + if (db->persistent) + { + // XXX async OK? + uintptr_t pval = (uintptr_t) dataset & ~pagesize_m1; + msync ((void *) pval, + ((uintptr_t) dataset & pagesize_m1) + + sizeof (struct dataset) + req->key_len, MS_ASYNC); + } + /* Now get the lock to safely insert the records. */ pthread_rwlock_rdlock (&db->lock); @@ -245,7 +255,7 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req, && memcmp (&dataset->resp, dh->data, dh->allocsize - offsetof (struct dataset, resp)) == 0) { - /* The sata has not changed. We will just bump the + /* The data has not changed. We will just bump the timeout value. Note that the new record has been allocated on the stack and need not be freed. */ dh->timeout = dataset->head.timeout; |