From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: gitster@pobox.com, jnareb@gmail.com, mlbright@gmail.com,
e@80x24.org, peff@peff.net, Johannes.Schindelin@gmx.de,
ben@wijen.net, Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v5 07/15] pkt-line: add functions to read/write flush terminated packet streams
Date: Wed, 10 Aug 2016 15:04:03 +0200 [thread overview]
Message-ID: <20160810130411.12419-8-larsxschneider@gmail.com> (raw)
In-Reply-To: <20160810130411.12419-1-larsxschneider@gmail.com>
From: Lars Schneider <larsxschneider@gmail.com>
packet_write_stream_with_flush_from_fd() and
packet_write_stream_with_flush_from_buf() write a stream of packets. All
content packets use the maximal packet size except for the last one.
After the last content packet a `flush` control packet is written.
packet_read_till_flush() reads arbitary sized packets until it detects
a `flush` packet.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
pkt-line.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
pkt-line.h | 7 +++++
2 files changed, 96 insertions(+)
diff --git a/pkt-line.c b/pkt-line.c
index e6a0924..4b526e1 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -181,6 +181,45 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
va_end(args);
}
+int packet_write_stream_with_flush_from_fd(int fd_in, int fd_out)
+{
+ int err = 0;
+ ssize_t bytes_to_write;
+ while (!err) {
+ bytes_to_write = xread(fd_in, packet_write_buffer, PKTLINE_DATA_MAXLEN);
+ if (bytes_to_write < 0)
+ return COPY_READ_ERROR;
+ if (bytes_to_write == 0)
+ break;
+ if (bytes_to_write > PKTLINE_DATA_MAXLEN)
+ return COPY_WRITE_ERROR;
+ err = packet_write_gently(fd_out, packet_write_buffer, bytes_to_write);
+ }
+ if (!err)
+ err = packet_flush_gently(fd_out);
+ return err;
+}
+
+int packet_write_stream_with_flush_from_buf(const char *src_in, size_t len, int fd_out)
+{
+ int err = 0;
+ size_t bytes_written = 0;
+ size_t bytes_to_write;
+ while (!err) {
+ if ((len - bytes_written) > PKTLINE_DATA_MAXLEN)
+ bytes_to_write = PKTLINE_DATA_MAXLEN;
+ else
+ bytes_to_write = len - bytes_written;
+ if (bytes_to_write == 0)
+ break;
+ err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write);
+ bytes_written += bytes_to_write;
+ }
+ if (!err)
+ err = packet_flush_gently(fd_out);
+ return err;
+}
+
static int get_packet_data(int fd, char **src_buf, size_t *src_size,
void *dst, unsigned size, int options)
{
@@ -290,3 +329,53 @@ char *packet_read_line_buf(char **src, size_t *src_len, int *dst_len)
{
return packet_read_line_generic(-1, src, src_len, dst_len);
}
+
+ssize_t packet_read_till_flush(int fd_in, struct strbuf *sb_out)
+{
+ int len, ret;
+ int options = PACKET_READ_GENTLE_ON_EOF;
+ char linelen[4];
+
+ size_t oldlen = sb_out->len;
+ size_t oldalloc = sb_out->alloc;
+
+ for (;;) {
+ /* Read packet header */
+ ret = get_packet_data(fd_in, NULL, NULL, linelen, 4, options);
+ if (ret < 0)
+ goto done;
+ len = packet_length(linelen);
+ if (len < 0)
+ die("protocol error: bad line length character: %.4s", linelen);
+ if (!len) {
+ /* Found a flush packet - Done! */
+ packet_trace("0000", 4, 0);
+ break;
+ }
+ len -= 4;
+
+ /* Read packet content */
+ strbuf_grow(sb_out, len);
+ ret = get_packet_data(fd_in, NULL, NULL, sb_out->buf + sb_out->len, len, options);
+ if (ret < 0)
+ goto done;
+
+ if (ret != len) {
+ error("protocol error: incomplete read (expected %d, got %d)", len, ret);
+ goto done;
+ }
+
+ packet_trace(sb_out->buf + sb_out->len, len, 0);
+ sb_out->len += len;
+ }
+
+done:
+ if (ret < 0) {
+ if (oldalloc == 0)
+ strbuf_release(sb_out);
+ else
+ strbuf_setlen(sb_out, oldlen);
+ return ret; /* unexpected EOF */
+ }
+ return sb_out->len - oldlen;
+}
diff --git a/pkt-line.h b/pkt-line.h
index b6c8bcd..89063ee 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -25,6 +25,8 @@ void packet_buf_flush(struct strbuf *buf);
void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
int packet_flush_gently(int fd);
int packet_write_gently_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
+int packet_write_stream_with_flush_from_fd(int fd_in, int fd_out);
+int packet_write_stream_with_flush_from_buf(const char *src_in, size_t len, int fd_out);
/*
* Read a packetized line into the buffer, which must be at least size bytes
@@ -77,6 +79,11 @@ char *packet_read_line(int fd, int *size);
*/
char *packet_read_line_buf(char **src_buf, size_t *src_len, int *size);
+/*
+ * Reads a stream of variable sized packets until a flush packet is detected.
+ */
+ssize_t packet_read_till_flush(int fd_in, struct strbuf *sb_out);
+
#define DEFAULT_PACKET_MAX 1000
#define LARGE_PACKET_MAX 65520
#define PKTLINE_DATA_MAXLEN (LARGE_PACKET_MAX - 4)
--
2.9.2
next prev parent reply other threads:[~2016-08-10 19:29 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160803164225.46355-1-larsxschneider@gmail.com/>
2016-08-10 13:03 ` [PATCH v5 00/15] Git filter protocol larsxschneider
2016-08-10 13:03 ` [PATCH v5 01/15] pkt-line: extract set_packet_header() larsxschneider
2016-08-10 13:03 ` [PATCH v5 02/15] pkt-line: call packet_trace() only if a packet is actually send larsxschneider
2016-08-10 13:13 ` Jeff King
2016-08-10 13:24 ` Lars Schneider
2016-08-10 13:30 ` Jeff King
2016-08-10 13:51 ` Lars Schneider
2016-08-10 14:33 ` Jeff King
2016-08-10 13:03 ` [PATCH v5 03/15] pkt-line: add `gentle` parameter to format_packet() larsxschneider
2016-08-10 13:15 ` Jeff King
2016-08-10 13:29 ` Lars Schneider
2016-08-10 13:37 ` Jeff King
2016-08-10 13:59 ` Lars Schneider
2016-08-10 14:34 ` Jeff King
2016-08-10 13:04 ` [PATCH v5 04/15] pkt-line: add packet_write_gently() larsxschneider
2016-08-10 13:28 ` Jeff King
2016-08-10 13:36 ` Lars Schneider
2016-08-10 13:40 ` Jeff King
2016-08-10 17:17 ` Junio C Hamano
2016-08-10 17:49 ` Lars Schneider
2016-08-10 18:21 ` Junio C Hamano
2016-08-10 19:15 ` Lars Schneider
2016-08-10 13:04 ` [PATCH v5 05/15] pkt-line: add packet_write_gently_fmt() larsxschneider
2016-08-10 13:43 ` Jeff King
2016-08-10 14:10 ` Lars Schneider
2016-08-10 15:01 ` Jeff King
2016-08-10 17:18 ` Junio C Hamano
2016-08-10 17:53 ` Lars Schneider
2016-08-10 18:42 ` Junio C Hamano
2016-08-10 13:04 ` [PATCH v5 06/15] pkt-line: add packet_flush_gently() larsxschneider
2016-08-10 13:04 ` larsxschneider [this message]
2016-08-10 13:04 ` [PATCH v5 08/15] pkt-line: rename packet_write() to packet_write_fmt() larsxschneider
2016-08-10 13:04 ` [PATCH v5 09/15] pack-protocol: fix maximum pkt-line size larsxschneider
2016-08-10 13:04 ` [PATCH v5 10/15] convert: quote filter names in error messages larsxschneider
2016-08-10 13:04 ` [PATCH v5 11/15] convert: modernize tests larsxschneider
2016-08-10 13:04 ` [PATCH v5 12/15] convert: generate large test files only once larsxschneider
2016-08-10 13:04 ` [PATCH v5 13/15] convert: make apply_filter() adhere to standard Git error handling larsxschneider
2016-08-10 13:04 ` [PATCH v5 14/15] convert: add filter.<driver>.process option larsxschneider
2016-08-12 16:33 ` Stefan Beller
2016-08-12 16:38 ` Jeff King
2016-08-12 16:48 ` Stefan Beller
2016-08-12 17:08 ` Lars Schneider
2016-08-12 17:13 ` Junio C Hamano
2016-08-12 17:21 ` Lars Schneider
2016-08-12 18:03 ` Junio C Hamano
2016-08-12 16:59 ` Lars Schneider
2016-08-12 17:07 ` Stefan Beller
2016-08-12 17:14 ` Lars Schneider
2016-08-10 13:04 ` [PATCH v5 15/15] read-cache: make sure file handles are not inherited by child processes larsxschneider
2016-08-18 14:23 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160810130411.12419-8-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=ben@wijen.net \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=mlbright@gmail.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).