Skip to content

upload-pack: send keepalive while feeding pack-objects #2160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spkrka wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −3
Open

upload-pack: send keepalive while feeding pack-objects #2160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions upload-pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,22 @@ static int relay_pack_data(int pack_objects_out, struct output_state *os,
return readsz;
}

static void send_pack_keepalive(const struct upload_pack_data *pack_data,
uint64_t *last_sent_ms)
{
uint64_t now_ms;

if (!pack_data->use_sideband || pack_data->keepalive <= 0)
return;

now_ms = getnanotime() / 1000000;
if (now_ms - *last_sent_ms >= (uint64_t)pack_data->keepalive * 1000) {
static const char buf[] = "0005\1";
write_or_die(1, buf, 5);
*last_sent_ms = now_ms;
}
}

static void create_pack_file(struct upload_pack_data *pack_data,
const struct string_list *uri_protocols)
{
Expand Down Expand Up @@ -361,16 +377,24 @@ static void create_pack_file(struct upload_pack_data *pack_data,
if (pack_data->shallow_nr)
for_each_commit_graft(write_one_shallow, pipe_fd);

for (i = 0; i < pack_data->want_obj.nr; i++)
last_sent_ms = getnanotime() / 1000000;

for (i = 0; i < pack_data->want_obj.nr; i++) {
fprintf(pipe_fd, "%s\n",
oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
send_pack_keepalive(pack_data, &last_sent_ms);
}
fprintf(pipe_fd, "--not\n");
for (i = 0; i < pack_data->have_obj.nr; i++)
for (i = 0; i < pack_data->have_obj.nr; i++) {
fprintf(pipe_fd, "%s\n",
oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
for (i = 0; i < pack_data->extra_edge_obj.nr; i++)
send_pack_keepalive(pack_data, &last_sent_ms);
}
for (i = 0; i < pack_data->extra_edge_obj.nr; i++) {
fprintf(pipe_fd, "%s\n",
oid_to_hex(&pack_data->extra_edge_obj.objects[i].item->oid));
send_pack_keepalive(pack_data, &last_sent_ms);
}
fprintf(pipe_fd, "\n");
fflush(pipe_fd);
fclose(pipe_fd);
Expand Down
Loading