(handle_request): Use it instead of sendfile call.
* nscd/nscd-client.h: Declare sendfileall.
* nscd/aicache.c: Use sendfileall instead of sendfile.
* nscd/grpcache.c: Likewise.
* nscd/hstcache.c: Likewise.
* nscd/initgrcache.c: Likewise.
* nscd/pwdcache.c: Likewise.
2005-11-22 Ulrich Drepper <drepper@redhat.com>
+ * nscd/connections.c (sendfileall): Define.
+ (handle_request): Use it instead of sendfile call.
+ * nscd/nscd-client.h: Declare sendfileall.
+ * nscd/aicache.c: Use sendfileall instead of sendfile.
+ * nscd/grpcache.c: Likewise.
+ * nscd/hstcache.c: Likewise.
+ * nscd/initgrcache.c: Likewise.
+ * nscd/pwdcache.c: Likewise.
+
[BZ #1908]
* manual/install.texi (Tools for Compilation): Require gawk.
#include <time.h>
#include <unistd.h>
#include <sys/mman.h>
-#ifdef HAVE_SENDFILE
-# include <sys/sendfile.h>
-#endif
#include "dbg_log.h"
#include "nscd.h"
<= (sizeof (struct database_pers_head)
+ db->head->module * sizeof (ref_t)
+ db->head->data_size));
- off_t off = (char *) &dataset->resp - (char *) db->head;
ssize_t written;
- written = sendfile (fd, db->wr_fd, &off, total);
+ written = sendfileall (fd, db->wr_fd,
+ (char *) &dataset->resp
+ - (char *) db->head, total);
# ifndef __ASSUME_SENDFILE
if (written == -1 && errno == ENOSYS)
goto use_write;
}
+#ifdef HAVE_SENDFILE
+ssize_t
+sendfileall (int tofd, int fromfd, off_t off, size_t len)
+{
+ ssize_t n = len;
+ ssize_t ret;
+
+ do
+ {
+ ret = TEMP_FAILURE_RETRY (sendfile (tofd, fromfd, &off, n));
+ if (ret <= 0)
+ break;
+ n -= ret;
+ }
+ while (n > 0);
+ return ret < 0 ? ret : len - n;
+}
+#endif
+
+
enum usekey
{
use_not = 0,
<= (sizeof (struct database_pers_head)
+ db->head->module * sizeof (ref_t)
+ db->head->data_size));
- off_t off = (char *) cached->data - (char *) db->head;
- nwritten = sendfile (fd, db->wr_fd, &off, cached->recsize);
+ nwritten = sendfileall (fd, db->wr_fd,
+ (char *) cached->data
+ - (char *) db->head, cached->recsize);
# ifndef __ASSUME_SENDFILE
if (nwritten == -1 && errno == ENOSYS)
goto use_write;
#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>
<= (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);
+ written = sendfileall (fd, db->wr_fd,
+ (char *) &dataset->resp
+ - (char *) db->head, total);
# ifndef __ASSUME_SENDFILE
if (written == -1 && errno == ENOSYS)
goto use_write;
#include <arpa/inet.h>
#include <arpa/nameser.h>
#include <sys/mman.h>
-#ifdef HAVE_SENDFILE
-# include <sys/sendfile.h>
-#endif
#include <stackinfo.h>
#include "nscd.h"
<= (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);
+ written = sendfileall (fd, db->wr_fd,
+ (char *) &dataset->resp
+ - (char *) db->head, total);
# ifndef __ASSUME_SENDFILE
if (written == -1 && errno == ENOSYS)
goto use_write;
#include <time.h>
#include <unistd.h>
#include <sys/mman.h>
-#ifdef HAVE_SENDFILE
-# include <sys/sendfile.h>
-#endif
#include "dbg_log.h"
#include "nscd.h"
<= (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);
+ written = sendfileall (fd, db->wr_fd,
+ (char *) &dataset->resp
+ - (char *) db->head, total);
# ifndef __ASSUME_SENDFILE
if (written == -1 && errno == ENOSYS)
goto use_write;
attribute_hidden;
extern ssize_t writeall (int fd, const void *buf, size_t len)
attribute_hidden;
+extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
+ attribute_hidden;
#endif /* nscd.h */
#include <time.h>
#include <unistd.h>
#include <sys/mman.h>
-#ifdef HAVE_SENDFILE
-# include <sys/sendfile.h>
-#endif
#include <sys/socket.h>
#include <stackinfo.h>
<= (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);
+ written = sendfileall (fd, db->wr_fd,
+ (char *) &dataset->resp
+ - (char *) db->head, total);
# ifndef __ASSUME_SENDFILE
if (written == -1 && errno == ENOSYS)
goto use_write;
struct dtv_slotinfo
{
size_t gen;
- bool is_static;
struct link_map *map;
} slotinfo[0];
} *_dl_tls_dtv_slotinfo_list;