kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

remote-curl: refactor reading into rpc_state's buf 

Currently, whenever remote-curl reads pkt-lines from its response file
descriptor, only the payload is written to its buf, not the 4 characters
denoting the length. A future patch will require the ability to also
write those 4 characters, so in preparation for that, refactor this read
into its own function.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Tan 2019-02-21 12:24:40 -08:00 committed by Junio C Hamano
parent b35903092e
commit 78ad91728d
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
remote-curl.c
View File

@ -520,6 +520,25 @@ struct rpc_state {
unsigned initial_buffer : 1; unsigned initial_buffer : 1;
}; };


/*
* Appends the result of reading from rpc->out to the string represented by
* rpc->buf and rpc->len if there is enough space. Returns 1 if there was
* enough space, 0 otherwise.
*
* Writes the number of bytes appended into appended.
*/
static int rpc_read_from_out(struct rpc_state *rpc, size_t *appended) {
size_t left = rpc->alloc - rpc->len;
char *buf = rpc->buf + rpc->len;

if (left < LARGE_PACKET_MAX)
return 0;

*appended = packet_read(rpc->out, NULL, NULL, buf, left, 0);
rpc->len += *appended;
return 1;
}

static size_t rpc_out(void *ptr, size_t eltsize, static size_t rpc_out(void *ptr, size_t eltsize,
size_t nmemb, void *buffer_) size_t nmemb, void *buffer_)
{ {
@ -529,11 +548,12 @@ static size_t rpc_out(void *ptr, size_t eltsize,


if (!avail) { if (!avail) {
rpc->initial_buffer = 0; rpc->initial_buffer = 0;
avail = packet_read(rpc->out, NULL, NULL, rpc->buf, rpc->alloc, 0); rpc->len = 0;
if (!rpc_read_from_out(rpc, &avail))
BUG("The entire rpc->buf should be larger than LARGE_PACKET_DATA_MAX");
if (!avail) if (!avail)
return 0; return 0;
rpc->pos = 0; rpc->pos = 0;
rpc->len = avail;
} }


if (max < avail) if (max < avail)
@ -677,20 +697,15 @@ static int post_rpc(struct rpc_state *rpc)
* chunked encoding mess. * chunked encoding mess.
*/ */
while (1) { while (1) {
size_t left = rpc->alloc - rpc->len; size_t n;
char *buf = rpc->buf + rpc->len;
int n;


if (left < LARGE_PACKET_MAX) { if (!rpc_read_from_out(rpc, &n)) {
large_request = 1; large_request = 1;
use_gzip = 0; use_gzip = 0;
break; break;
} }

n = packet_read(rpc->out, NULL, NULL, buf, left, 0);
if (!n) if (!n)
break; break;
rpc->len += n;
} }


if (large_request) { if (large_request) {