From eac10791463c42ff4f6da20f548c046e300b3d6d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 19 Nov 2005 17:22:39 +0000 Subject: * sysdeps/unix/sysv/linux/ia64/bits/shm.h (shmatt_t): New type. (struct shmid_ds): Use it for shm_nattch field. 2005-11-18 Jakub Jelinek * sysdeps/unix/sysv/linux/futimesat.c (futimesat): If FILE is NULL, set access and modification times of the file referenced by FD. * sysdeps/generic/futimesat.c (futimesat): Don't return EINVAL if FILE is NULL. Don't check FD if FILE is absolute path. 2005-11-19 Ulrich Drepper * nscd/nscd_gethst_r.c (nscd_gethst_r): Avoid unnecesary read call if there are no aliases. * sysdeps/unix/sysv/linux/Makefile (CFLAGS-connections.c, CFLAGS-pwdcache.c, CFLAGS-grpcache.c, CFLAGS-hstcache.c, CFLAGS-aicache.c, CFLAGS-initgrcache.c): Add -DHAVE_SENDFILE. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_SENDFILE): Define. * nscd/pwdcache.c [HAVE_SENDFILE]: Include and . [HAVE_SENDFILE] (cache_addpw): Use sendfile to transmit positive result. * nscd/grpcache.c: Likewise. * nscd/hstcache.c: Likewise. * nscd/aicache.c: Likewise. * nscd/initgrcache.c: Likewise. * nscd/connectionc.c: Likewise. --- nscd/initgrcache.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'nscd/initgrcache.c') diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c index bb6dee2b4e..eb03fc7a5d 100644 --- a/nscd/initgrcache.c +++ b/nscd/initgrcache.c @@ -26,8 +26,15 @@ #include #include #include -#include -#include +#ifdef HAVE_SENDFILE +# include +#endif + +#include "dbg_log.h" +#include "nscd.h" +#ifdef HAVE_SENDFILE +# include +#endif #include "../nss/nsswitch.h" @@ -344,7 +351,29 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, unnecessarily let the receiver wait. */ assert (fd != -1); - written = writeall (fd, &dataset->resp, total); +#ifdef HAVE_SENDFILE + if (__builtin_expect (db->mmap_used, 1)) + { + assert (db->wr_fd != -1); + assert ((char *) &dataset->resp > (char *) db->data); + assert ((char *) &dataset->resp - (char *) db->head + + total + <= (sizeof (struct database_pers_head) + + db->head->module * sizeof (ref_t) + + db->head->data_size)); + off_t off = (char *) &dataset->resp - (char *) db->head; + written = sendfile (fd, db->wr_fd, &off, total); +# ifndef __ASSUME_SENDFILE + if (written == -1 && errno == ENOSYS) + goto use_write; +# endif + } + else +# ifndef __ASSUME_SENDFILE + use_write: +# endif +#endif + written = writeall (fd, &dataset->resp, total); } -- cgit 1.4.1