2.5-18.1

[thirdparty/glibc.git] / nscd / aicache.c

diff --git a/nscd/aicache.c b/nscd/aicache.c
index 4e0496ff44be0d3ac9f1ca23a916d9be2962ff90..4640b4df948a524e0d3ffaaee7809ec7fbeaecdc 100644 (file)
--- a/nscd/aicache.c
+++ b/nscd/aicache.c
@@ -1,22 +1,20 @@
 /* Cache handling for host lookup.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License version 2 as
+   published by the Free Software Foundation.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <assert.h>
 #include <errno.h>
@@ -26,8 +24,12 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <dbg_log.h>
-#include <nscd.h>
+
+#include "dbg_log.h"
+#include "nscd.h"
+#ifdef HAVE_SENDFILE
+# include <kernel-features.h>
+#endif
 
 
 typedef enum nss_status (*nss_gethostbyname3_r)
@@ -310,7 +312,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
                      *family++ = th[j].h_addrtype;
                    }
 
-             char *cp = family;
+             void *cp = family;
              if (canon != NULL)
                cp = mempcpy (cp, canon, canonlen);
 
@@ -365,7 +367,31 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
                     wait.  */
                  assert (fd != -1);
 
-                 TEMP_FAILURE_RETRY (write (fd, &dataset->resp, total));
+#ifdef HAVE_SENDFILE
+                 if (__builtin_expect (db->mmap_used, 1) && !alloca_used)
+                   {
+                     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));
+                     ssize_t written;
+                     written = sendfileall (fd, db->wr_fd,
+                                            (char *) &dataset->resp
+                                            - (char *) db->head, total);
+# ifndef __ASSUME_SENDFILE
+                     if (written == -1 && errno == ENOSYS)
+                       goto use_write;
+# endif
+                   }
+                 else
+# ifndef __ASSUME_SENDFILE
+                 use_write:
+# endif
+#endif
+                   writeall (fd, &dataset->resp, total);
                }
 
              goto out;
@@ -399,7 +425,7 @@ addhstaiX (struct database_dyn *db, int fd, request_header *req,
       total = sizeof (notfound);
 
       if (fd != -1)
-       TEMP_FAILURE_RETRY (write (fd, &notfound, total));
+       TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
 
       dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len);
       /* If we cannot permanently store the result, so be it.  */