From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/
Date: Mon, 13 Dec 2021 08:39:39 +0000 (UTC) [thread overview]
Message-ID: <1639379824.53d7d24872527a69501f4c74a44e16e29aa3bb4a.grobian@gentoo> (raw)
commit: 53d7d24872527a69501f4c74a44e16e29aa3bb4a
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 07:17:04 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 07:17:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=53d7d248
libq/copy_file: employ sendfile() if possible
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
libq/copy_file.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 67 insertions(+), 11 deletions(-)
diff --git a/libq/copy_file.c b/libq/copy_file.c
index e4619ce..955fd78 100644
--- a/libq/copy_file.c
+++ b/libq/copy_file.c
@@ -1,29 +1,85 @@
/*
- * Copyright 2005-2019 Gentoo Foundation
+ * Copyright 2005-2021 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2011-2016 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2021- Fabian Groffen - <grobian@gentoo.org>
*/
#include "main.h"
#include "safe_io.h"
#include "copy_file.h"
+/* includes for when sendfile is available */
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#if defined(HAVE_SENDFILE4_SUPPORT)
+/* Linux/Solaris */
+# include <sys/sendfile.h>
+#elif defined(HAVE_SENDFILE6_SUPPORT) || defined(HAVE_SENDFILE7_SUPPORT)
+/* macOS (since Darwin 9) + FreeBSD */
+# include <sys/socket.h>
+# include <sys/uio.h>
+#endif
+
int copy_file_fd(int fd_src, int fd_dst)
{
- ssize_t rcnt, wcnt;
- char buf[64 * 1024];
+#if defined(HAVE_SENDFILE4_SUPPORT) || \
+ defined(HAVE_SENDFILE6_SUPPORT) || \
+ defined(HAVE_SENDFILE7_SUPPORT)
+ struct stat stat_buf;
+ ssize_t ret;
+ size_t len;
+ off_t offset = 0;
- while (1) {
- rcnt = safe_read(fd_src, buf, sizeof(buf));
- if (rcnt < 0)
- return -1;
- else if (rcnt == 0)
+ if (fstat(fd_src, &stat_buf) != -1) {
+ len = (size_t)stat_buf.st_size;
+
+#if defined(HAVE_SENDFILE4_SUPPORT)
+ /* Linux/Solaris */
+ ret = sendfile(fd_dst, fd_src, &offset, len);
+ /* everything looks fine, return success */
+ if (ret == (ssize_t)len)
return 0;
+#elif defined(HAVE_SENDFILE6_SUPPORT)
+ /* macOS (since Darwin 9) */
+ offset = len;
+ ret = (ssize_t)sendfile(fd_src, fd_dst, 0, &offset, NULL, 0);
+ /* everything looks fine, return success */
+ if (offset == (off_t)len)
+ return 0;
+#elif defined(HAVE_SENDFILE7_SUPPORT)
+ /* FreeBSD */
+ ret = (ssize_t)sendfile(fd_src, fd_dst, offset, len, NULL, &offset, 0);
+ /* everything looks fine, return success */
+ if (offset == (off_t)len)
+ return 0;
+#endif
- wcnt = safe_write(fd_dst, buf, rcnt);
- if (wcnt == -1)
- return -1;
+ /* fall back to read/write, rewind the fd */
+ lseek(fd_src, 0, SEEK_SET);
+ }
+#endif /* HAVE_SENDFILE */
+
+ /* fallback, keep in its own scope, so we avoid 64K stack alloc if
+ * sendfile works properly */
+ {
+ ssize_t rcnt, wcnt;
+ char buf[64 * 1024];
+
+ while (1) {
+ rcnt = safe_read(fd_src, buf, sizeof(buf));
+ if (rcnt < 0)
+ return -1;
+ else if (rcnt == 0)
+ return 0;
+
+ wcnt = safe_write(fd_dst, buf, rcnt);
+ if (wcnt == -1)
+ return -1;
+ }
}
}
next reply other threads:[~2021-12-13 8:39 UTC|newest]
Thread overview: 207+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 8:39 Fabian Groffen [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-28 20:38 [gentoo-commits] proj/portage-utils:master commit in: libq/ Fabian Groffen
2025-08-28 7:27 Fabian Groffen
2025-08-25 11:28 Fabian Groffen
2025-08-24 16:34 Fabian Groffen
2025-08-21 19:17 Fabian Groffen
2025-08-21 14:12 Fabian Groffen
2025-08-21 9:13 Fabian Groffen
2025-08-20 16:04 Fabian Groffen
2025-06-27 14:00 Fabian Groffen
2025-06-25 15:40 Fabian Groffen
2025-04-21 14:44 Fabian Groffen
2024-07-03 19:44 Fabian Groffen
2024-04-08 19:27 Fabian Groffen
2024-02-01 8:21 Fabian Groffen
2024-02-01 8:21 Fabian Groffen
2024-01-31 20:41 Fabian Groffen
2024-01-31 19:30 Fabian Groffen
2024-01-31 19:29 Fabian Groffen
2024-01-27 13:28 Fabian Groffen
2023-04-21 19:11 Fabian Groffen
2023-01-30 14:14 Fabian Groffen
2022-05-26 14:36 Fabian Groffen
2022-05-26 14:36 Fabian Groffen
2022-05-20 17:15 Fabian Groffen
2022-05-20 17:15 Fabian Groffen
2022-05-19 8:32 Fabian Groffen
2022-05-19 8:16 Fabian Groffen
2022-05-19 7:45 Fabian Groffen
2022-02-12 17:13 Fabian Groffen
2022-02-12 17:13 Fabian Groffen
2022-02-06 14:51 Fabian Groffen
2022-02-06 14:29 Fabian Groffen
2022-02-06 13:27 Fabian Groffen
2022-02-06 13:27 Fabian Groffen
2022-02-06 12:22 Fabian Groffen
2021-12-29 12:20 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-26 13:59 Fabian Groffen
2021-12-13 8:39 Fabian Groffen
2021-11-13 14:27 Fabian Groffen
2021-10-09 12:13 Fabian Groffen
2021-10-04 6:28 Fabian Groffen
2021-10-04 6:28 Fabian Groffen
2021-10-03 10:49 Fabian Groffen
2021-06-23 7:14 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-14 9:34 Fabian Groffen
2021-06-01 19:43 Fabian Groffen
2021-05-23 10:54 Fabian Groffen
2021-05-10 9:15 Fabian Groffen
2021-04-29 15:04 Fabian Groffen
2021-04-29 13:47 Fabian Groffen
2021-04-29 13:24 Fabian Groffen
2021-03-13 12:44 Fabian Groffen
2021-02-20 12:06 Fabian Groffen
2021-02-20 11:44 Fabian Groffen
2021-02-17 20:23 Fabian Groffen
2021-02-17 20:23 Fabian Groffen
2021-01-15 20:05 Fabian Groffen
2020-06-27 9:38 Fabian Groffen
2020-06-07 10:41 Fabian Groffen
2020-05-25 18:19 Fabian Groffen
2020-05-25 18:02 Fabian Groffen
2020-05-25 13:26 Fabian Groffen
2020-05-25 11:20 Fabian Groffen
2020-05-25 11:06 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-25 10:43 Fabian Groffen
2020-05-17 12:35 Fabian Groffen
2020-05-17 12:35 Fabian Groffen
2020-02-03 13:17 Fabian Groffen
2020-02-03 13:09 Fabian Groffen
2020-01-26 19:31 Fabian Groffen
2020-01-22 19:54 Fabian Groffen
2020-01-22 19:54 Fabian Groffen
2020-01-20 19:54 Fabian Groffen
2020-01-20 19:34 Fabian Groffen
2020-01-19 19:36 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 19:09 Fabian Groffen
2020-01-19 16:37 Fabian Groffen
2020-01-19 12:37 Fabian Groffen
2020-01-19 10:05 Fabian Groffen
2020-01-19 9:49 Fabian Groffen
2020-01-19 9:49 Fabian Groffen
2020-01-17 8:22 Fabian Groffen
2020-01-05 16:08 Fabian Groffen
2020-01-05 16:08 Fabian Groffen
2020-01-05 16:08 Fabian Groffen
2020-01-02 15:09 Fabian Groffen
2020-01-02 14:07 Fabian Groffen
2020-01-02 14:07 Fabian Groffen
2020-01-02 14:07 Fabian Groffen
2020-01-02 11:55 Fabian Groffen
2020-01-02 11:19 Fabian Groffen
2019-12-30 17:24 Fabian Groffen
2019-12-27 21:19 Fabian Groffen
2019-12-27 16:57 Fabian Groffen
2019-12-27 16:57 Fabian Groffen
2019-11-29 13:22 Fabian Groffen
2019-11-20 17:23 Fabian Groffen
2019-11-19 20:28 Fabian Groffen
2019-11-17 15:12 Fabian Groffen
2019-11-17 15:12 Fabian Groffen
2019-11-13 18:19 Fabian Groffen
2019-11-13 15:48 Fabian Groffen
2019-11-13 15:20 Fabian Groffen
2019-11-09 10:29 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 14:06 Fabian Groffen
2019-09-26 13:00 Fabian Groffen
2019-09-25 15:05 Fabian Groffen
2019-09-21 19:53 Fabian Groffen
2019-09-21 19:53 Fabian Groffen
2019-07-14 18:51 Fabian Groffen
2019-07-13 15:37 Fabian Groffen
2019-07-13 9:50 Fabian Groffen
2019-07-12 18:04 Fabian Groffen
2019-06-19 7:41 Fabian Groffen
2019-06-10 10:09 Fabian Groffen
2019-06-05 7:57 Fabian Groffen
2019-05-21 14:12 Fabian Groffen
2019-05-14 20:19 Fabian Groffen
2019-05-14 20:19 Fabian Groffen
2019-05-11 11:11 Fabian Groffen
2019-05-11 7:14 Fabian Groffen
2019-05-11 7:14 Fabian Groffen
2019-05-10 15:32 Fabian Groffen
2019-05-10 15:32 Fabian Groffen
2019-05-10 15:32 Fabian Groffen
2019-05-07 6:19 Fabian Groffen
2019-05-06 16:04 Fabian Groffen
2019-05-06 16:04 Fabian Groffen
2019-05-05 20:05 Fabian Groffen
2019-05-05 18:13 Fabian Groffen
2019-05-05 8:58 Fabian Groffen
2019-05-04 11:53 Fabian Groffen
2019-05-03 11:45 Fabian Groffen
2019-05-02 15:17 Fabian Groffen
2019-05-01 19:09 Fabian Groffen
2019-04-30 8:20 Fabian Groffen
2019-04-30 7:54 Fabian Groffen
2019-04-28 17:10 Fabian Groffen
2019-04-28 16:21 Fabian Groffen
2019-04-28 16:02 Fabian Groffen
2019-04-27 8:38 Fabian Groffen
2019-04-25 17:36 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-25 9:22 Fabian Groffen
2019-04-19 11:47 Fabian Groffen
2019-03-27 10:55 Fabian Groffen
2019-03-11 20:55 Fabian Groffen
2019-03-09 18:58 Fabian Groffen
2019-02-27 20:53 Fabian Groffen
2019-02-27 20:53 Fabian Groffen
2019-02-05 14:19 Fabian Groffen
2018-12-20 20:02 Fabian Groffen
2018-12-20 20:02 Fabian Groffen
2018-12-20 18:24 Fabian Groffen
2018-04-09 7:15 Fabian Groffen
2018-04-05 13:31 Fabian Groffen
2018-04-05 12:46 Fabian Groffen
2018-04-03 20:00 Fabian Groffen
2018-03-26 18:41 Fabian Groffen
2018-03-25 14:13 Fabian Groffen
2018-03-25 14:00 Fabian Groffen
2018-03-23 20:17 Fabian Groffen
2018-03-23 11:56 Fabian Groffen
2018-03-23 11:29 Fabian Groffen
2017-12-29 11:45 Fabian Groffen
2017-12-29 11:45 Fabian Groffen
2017-12-29 11:45 Fabian Groffen
2016-12-29 2:25 Mike Frysinger
2016-11-12 17:23 Mike Frysinger
2016-02-14 1:26 Mike Frysinger
2016-02-14 1:26 Mike Frysinger
2015-11-26 8:43 Mike Frysinger
2015-10-15 22:00 Mike Frysinger
2015-10-15 22:00 Mike Frysinger
2015-05-31 8:31 Mike Frysinger
2015-05-19 17:37 Mike Frysinger
2015-02-24 1:26 Mike Frysinger
2015-02-24 1:26 Mike Frysinger
2015-02-24 1:26 Mike Frysinger
2015-02-21 18:06 Mike Frysinger
2015-02-16 11:47 Mike Frysinger
2014-03-11 4:53 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
2014-03-08 5:51 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1639379824.53d7d24872527a69501f4c74a44e16e29aa3bb4a.grobian@gentoo \
--to=grobian@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox