mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkt-line: do not issue flush packets in write_packetized_*()

Browse Source 
Remove the `packet_flush_gently()` call in `write_packetized_from_buf() and
`write_packetized_from_fd()` and require the caller to call it if desired.
Rename both functions to `write_packetized_from_*_no_flush()` to prevent
later merge accidents.

`write_packetized_from_buf()` currently only has one caller:
`apply_multi_file_filter()` in `convert.c`.  It always wants a flush packet
to be written after writing the payload.

However, we are about to introduce a caller that wants to write many
packets before a final flush packet, so let's make the caller responsible
for emitting the flush packet.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2021-03-15 21:08:19 +00:00
committed by Junio C Hamano
parent 7455e05e4e
commit 3a63c6a48c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
convert.c
View File

@ -884,9 +884,13 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
goto done; goto done;
if (fd >= 0) if (fd >= 0)
err = write_packetized_from_fd(fd, process->in); err = write_packetized_from_fd_no_flush(fd, process->in);
else else
err = write_packetized_from_buf(src, len, process->in); err = write_packetized_from_buf_no_flush(src, len, process->in);
if (err)
goto done;
err = packet_flush_gently(process->in);
if (err) if (err)
goto done; goto done;

8
pkt-line.c
View File

@ -251,7 +251,7 @@ void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len)
packet_trace(data, len, 1); packet_trace(data, len, 1);
} }
int write_packetized_from_fd(int fd_in, int fd_out) int write_packetized_from_fd_no_flush(int fd_in, int fd_out)
{ {
char *buf = xmalloc(LARGE_PACKET_DATA_MAX); char *buf = xmalloc(LARGE_PACKET_DATA_MAX);
int err = 0; int err = 0;
@ -267,13 +267,11 @@ int write_packetized_from_fd(int fd_in, int fd_out)
break; break;
err = packet_write_gently(fd_out, buf, bytes_to_write); err = packet_write_gently(fd_out, buf, bytes_to_write);
} }
if (!err)
err = packet_flush_gently(fd_out);
free(buf); free(buf);
return err; return err;
} }
int write_packetized_from_buf(const char *src_in, size_t len, int fd_out) int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out)
{ {
int err = 0; int err = 0;
size_t bytes_written = 0; size_t bytes_written = 0;
@ -289,8 +287,6 @@ int write_packetized_from_buf(const char *src_in, size_t len, int fd_out)
err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write); err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write);
bytes_written += bytes_to_write; bytes_written += bytes_to_write;
} }
if (!err)
err = packet_flush_gently(fd_out);
return err; return err;
} }

4
pkt-line.h
View File

@ -32,8 +32,8 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len); void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len);
int packet_flush_gently(int fd); int packet_flush_gently(int fd);
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
int write_packetized_from_fd(int fd_in, int fd_out); int write_packetized_from_fd_no_flush(int fd_in, int fd_out);
int write_packetized_from_buf(const char *src_in, size_t len, int fd_out); int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out);
/* /*
* Read a packetized line into the buffer, which must be at least size bytes * Read a packetized line into the buffer, which must be at least size bytes