Show changes to 8 files +149 −18
Makefile, builtin/cat-file.c, config.mak.uname, git-compat-util.h, wrapper.c, wrapper.h, write-or-die.c, write-or-die.h
diff --git a/Makefile b/Makefile
index 3eab701b10..c7a062de00 100644
--- a/Makefile
+++ b/Makefile
@@ -1844,6 +1844,9 @@ ifdef NO_PREAD
COMPAT_CFLAGS += -DNO_PREAD
COMPAT_OBJS += compat/pread.o
endif
+ifdef HAVE_WRITEV
+ COMPAT_CFLAGS += -DHAVE_WRITEV
+endif
ifdef NO_FAST_WORKING_DIRECTORY
BASIC_CFLAGS += -DNO_FAST_WORKING_DIRECTORY
endif
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index efc0df760c..0a448e82a7 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -281,7 +281,7 @@ struct expand_data {
off_t disk_size;
const char *rest;
struct object_id delta_base_oid;
- void *content;
+ struct git_iovec iov[3];
/*
* If mark_query is true, we do not expand anything, but rather
@@ -379,17 +379,42 @@ static void batch_write(struct batch_options *opt, const void *data, size_t len)
write_or_die(1, data, len);
}
-static void print_object_or_die(struct batch_options *opt, struct expand_data *data)
+static void batch_writev(struct batch_options *opt, struct expand_data *data,
+ const struct strbuf *hdr, size_t size)
+{
+ data->iov[0].iov_base = hdr->buf;
+ data->iov[0].iov_len = hdr->len;
+ data->iov[1].iov_len = size;
+
+ /*
+ * Copying a (8|16)-byte iovec for a single byte is gross, but my
+ * attempt to stuff output_delim into the trailing NUL byte of
+ * iov[1].iov_base (and restoring it after writev(2) for the
+ * OI_DBCACHED case) to drop iovcnt from 3->2 wasn't faster.
+ */
+ data->iov[2].iov_base = &opt->output_delim;
+ data->iov[2].iov_len = 1;
+
+ if (opt->buffer_output)
+ fwritev_or_die(stdout, data->iov, 3);
+ else
+ writev_or_die(1, data->iov, 3);
+
+ /* writev_or_die may move iov[1].iov_base, so it's invalid */
+ data->iov[1].iov_base = NULL;
+}
+
+static void print_object_or_die(struct batch_options *opt,
+ struct expand_data *data, struct strbuf *hdr)
{
const struct object_id *oid = &data->oid;
assert(data->info.typep);
- if (data->content) {
- void *content = data->content;
+ if (data->iov[1].iov_base) {
+ void *content = data->iov[1].iov_base;
unsigned long size = data->size;
- data->content = NULL;
if (use_mailmap && (data->type == OBJ_COMMIT ||
data->type == OBJ_TAG)) {
size_t s = size;
@@ -401,10 +426,10 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
}
content = replace_idents_using_mailmap(content, &s);
+ data->iov[1].iov_base = content;
size = cast_size_t_to_ulong(s);
}
-
- batch_write(opt, content, size);
+ batch_writev(opt, data, hdr, size);
switch (data->info.whence) {
case OI_CACHED: BUG("FIXME OI_CACHED support not done");
case OI_LOOSE:
@@ -419,8 +444,6 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
}
} else {
assert(data->type == OBJ_BLOB);
- if (opt->buffer_output)
- fflush(stdout);
if (opt->transform_mode) {
char *contents;
unsigned long size;
@@ -447,10 +470,15 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
oid_to_hex(oid), data->rest);
} else
BUG("invalid transform_mode: %c", opt->transform_mode);
- batch_write(opt, contents, size);
+ data->iov[1].iov_base = contents;
+ batch_writev(opt, data, hdr, size);
free(contents);
} else {
+ batch_write(opt, hdr->buf, hdr->len);
+ if (opt->buffer_output)
+ fflush(stdout);
stream_blob(oid);
+ batch_write(opt, &opt->output_delim, 1);
}
}
}
@@ -519,12 +547,10 @@ static void batch_object_write(const char *obj_name,
strbuf_addch(scratch, opt->output_delim);
}
- batch_write(opt, scratch->buf, scratch->len);
-
- if (opt->batch_mode == BATCH_MODE_CONTENTS) {
- print_object_or_die(opt, data);
- batch_write(opt, &opt->output_delim, 1);
- }
+ if (opt->batch_mode == BATCH_MODE_CONTENTS)
+ print_object_or_die(opt, data, scratch);
+ else
+ batch_write(opt, scratch->buf, scratch->len);
}
static void batch_one_object(const char *obj_name,
@@ -666,7 +692,7 @@ static void parse_cmd_contents(struct batch_options *opt,
struct expand_data *data)
{
opt->batch_mode = BATCH_MODE_CONTENTS;
- data->info.contentp = &data->content;
+ data->info.contentp = &data->iov[1].iov_base;
batch_one_object(line, output, opt, data);
}
@@ -823,7 +849,7 @@ static int batch_objects(struct batch_options *opt)
data.info.typep = &data.type;
if (!opt->transform_mode) {
data.info.sizep = &data.size;
- data.info.contentp = &data.content;
+ data.info.contentp = &data.iov[1].iov_base;
data.info.content_limit = big_file_threshold;
data.info.direct_cache = USE_DIRECT_CACHE;
}
diff --git a/config.mak.uname b/config.mak.uname
index 85d63821ec..8ce8776657 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -69,6 +69,7 @@ ifeq ($(uname_S),Linux)
BASIC_CFLAGS += -std=c99
endif
LINK_FUZZ_PROGRAMS = YesPlease
+ HAVE_WRITEV = YesPlease
endif
ifeq ($(uname_S),GNU/kFreeBSD)
HAVE_ALLOCA_H = YesPlease
@@ -77,6 +78,7 @@ ifeq ($(uname_S),GNU/kFreeBSD)
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
LIBC_CONTAINS_LIBINTL = YesPlease
FREAD_READS_DIRECTORIES = UnfortunatelyYes
+ HAVE_WRITEV = YesPlease
endif
ifeq ($(uname_S),UnixWare)
CC = cc
@@ -292,6 +294,7 @@ ifeq ($(uname_S),FreeBSD)
PAGER_ENV = LESS=FRX LV=-c MORE=FRX
FREAD_READS_DIRECTORIES = UnfortunatelyYes
FILENO_IS_A_MACRO = UnfortunatelyYes
+ HAVE_WRITEV = YesPlease
endif
ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease
@@ -307,6 +310,7 @@ ifeq ($(uname_S),OpenBSD)
PROCFS_EXECUTABLE_PATH = /proc/curproc/file
FREAD_READS_DIRECTORIES = UnfortunatelyYes
FILENO_IS_A_MACRO = UnfortunatelyYes
+ HAVE_WRITEV = YesPlease
endif
ifeq ($(uname_S),MirBSD)
NO_STRCASESTR = YesPlease
@@ -329,6 +333,7 @@ ifeq ($(uname_S),NetBSD)
HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
CSPRNG_METHOD = arc4random
PROCFS_EXECUTABLE_PATH = /proc/curproc/exe
+ HAVE_WRITEV = YesPlease
endif
ifeq ($(uname_S),AIX)
DEFAULT_PAGER = more
diff --git a/git-compat-util.h b/git-compat-util.h
index ca7678a379..afde8abc99 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -388,6 +388,16 @@ static inline int git_setitimer(int which UNUSED,
#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue)
#endif
+#ifdef HAVE_WRITEV
+#include <sys/uio.h>
+#define git_iovec iovec
+#else /* !HAVE_WRITEV */
+struct git_iovec {
+ void *iov_base;
+ size_t iov_len;
+};
+#endif /* !HAVE_WRITEV */
+
#ifndef NO_LIBGEN_H
#include <libgen.h>
#else
diff --git a/wrapper.c b/wrapper.c
index f87d90bf57..066c772145 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -262,6 +262,24 @@ ssize_t xwrite(int fd, const void *buf, size_t len)
}
}
+#ifdef HAVE_WRITEV
+ssize_t xwritev(int fd, const struct iovec *iov, int iovcnt)
+{
+ while (1) {
+ ssize_t nr = writev(fd, iov, iovcnt);
+
+ if (nr < 0) {
+ if (errno == EINTR)
+ continue;
+ if (handle_nonblock(fd, POLLOUT, errno))
+ continue;
+ }
+
+ return nr;
+ }
+}
+#endif /* !HAVE_WRITEV */
+
/*
* xpread() is the same as pread(), but it automatically restarts pread()
* operations with a recoverable error (EAGAIN and EINTR). xpread() DOES
diff --git a/wrapper.h b/wrapper.h
index 1b2b047ea0..3d33c63d4f 100644
--- a/wrapper.h
+++ b/wrapper.h
@@ -16,6 +16,7 @@ void *xmmap_gently(void *start, size_t length, int prot, int flags, int fd, off_
int xopen(const char *path, int flags, ...);
ssize_t xread(int fd, void *buf, size_t len);
ssize_t xwrite(int fd, const void *buf, size_t len);
+ssize_t xwritev(int fd, const struct git_iovec *, int iovcnt);
ssize_t xpread(int fd, void *buf, size_t len, off_t offset);
int xdup(int fd);
FILE *xfopen(const char *path, const char *mode);
diff --git a/write-or-die.c b/write-or-die.c
index 01a9a51fa2..227b051165 100644
--- a/write-or-die.c
+++ b/write-or-die.c
@@ -107,3 +107,69 @@ void fflush_or_die(FILE *f)
if (fflush(f))
die_errno("fflush error");
}
+
+void fwritev_or_die(FILE *fp, const struct git_iovec *iov, int iovcnt)
+{
+ int i;
+
+ for (i = 0; i < iovcnt; i++) {
+ size_t n = iov[i].iov_len;
+
+ if (fwrite(iov[i].iov_base, 1, n, fp) != n)
+ die_errno("unable to write to FD=%d", fileno(fp));
+ }
+}
+
+/*
+ * note: we don't care about atomicity from writev(2) right now.
+ * The goal is to avoid allocations+copies in the writer and
+ * reduce wakeups+syscalls in the reader.
+ * n.b. @iov is not const since we modify it to avoid allocating
+ * on partial write.
+ */
+#ifdef HAVE_WRITEV
+void writev_or_die(int fd, struct git_iovec *iov, int iovcnt)
+{
+ int i;
+
+ while (iovcnt > 0) {
+ ssize_t n = xwritev(fd, iov, iovcnt);
+
+ /* EINVAL happens when sum of iov_len exceeds SSIZE_MAX */
+ if (n < 0 && errno == EINVAL)
+ n = xwrite(fd, iov[0].iov_base, iov[0].iov_len);
+ if (n < 0) {
+ check_pipe(errno);
+ die_errno("writev error");
+ } else if (!n) {
+ errno = ENOSPC;
+ die_errno("writev_error");
+ }
+ /* skip fully written iovs, retry from the first partial iov */
+ for (i = 0; i < iovcnt; i++) {
+ if (n >= iov[i].iov_len) {
+ n -= iov[i].iov_len;
+ } else {
+ iov[i].iov_len -= n;
+ iov[i].iov_base = (char *)iov[i].iov_base + n;
+ break;
+ }
+ }
+ iovcnt -= i;
+ iov += i;
+ }
+}
+#else /* !HAVE_WRITEV */
+
+/*
+ * n.b. don't use stdio fwrite here even if it's faster, @fd may be
+ * non-blocking and stdio isn't equipped for EAGAIN
+ */
+void writev_or_die(int fd, struct git_iovec *iov, int iovcnt)
+{
+ int i;
+
+ for (i = 0; i < iovcnt; i++)
+ write_or_die(fd, iov[i].iov_base, iov[i].iov_len);
+}
+#endif /* !HAVE_WRITEV */
diff --git a/write-or-die.h b/write-or-die.h
index 65a5c42a47..20abec211c 100644
--- a/write-or-die.h
+++ b/write-or-die.h
@@ -7,6 +7,8 @@ void fprintf_or_die(FILE *, const char *fmt, ...);
void fwrite_or_die(FILE *f, const void *buf, size_t count);
void fflush_or_die(FILE *f);
void write_or_die(int fd, const void *buf, size_t count);
+void writev_or_die(int fd, struct git_iovec *, int iovcnt);
+void fwritev_or_die(FILE *, const struct git_iovec *, int iovcnt);
/*
* These values are used to help identify parts of a repository to fsync.
