diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-11-19 20:05:14 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-11-19 20:05:14 +0000 |
| commit | 8e8c8d3c871666d3c4fb0cda0147fb2231beeb09 (patch) | |
| tree | 8205dc9da58d4c3090372b155fdede74e7b3d6b1 /nscd/grpcache.c | |
| parent | b9616a4d2d0ff113b95a638127ad27c98e6c713b (diff) | |
| download | glibc-8e8c8d3c871666d3c4fb0cda0147fb2231beeb09.tar glibc-8e8c8d3c871666d3c4fb0cda0147fb2231beeb09.tar.gz glibc-8e8c8d3c871666d3c4fb0cda0147fb2231beeb09.tar.bz2 glibc-8e8c8d3c871666d3c4fb0cda0147fb2231beeb09.zip | |
Updated to fedora-glibc-20051119T1959
Diffstat (limited to 'nscd/grpcache.c')
| -rw-r--r-- | nscd/grpcache.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/nscd/grpcache.c b/nscd/grpcache.c index 6543ef354d..fb043152c6 100644 --- a/nscd/grpcache.c +++ b/nscd/grpcache.c @@ -32,10 +32,17 @@ #include <string.h> #include <unistd.h> #include <sys/mman.h> +#ifdef HAVE_SENDFILE +# include <sys/sendfile.h> +#endif +#include <sys/socket.h> #include <stackinfo.h> #include "nscd.h" #include "dbg_log.h" +#ifdef HAVE_SENDFILE +# include <kernel-features.h> +#endif /* This is the standard reply in case the service is disabled. */ static const gr_response_header disabled = @@ -293,7 +300,29 @@ cache_addgr (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); } /* Add the record to the database. But only if it has not been |