undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send-pack: tell pack-objects to use its internal rev-list.

Browse Source 
This means one less process in the pipeline to worry about, and
removes about 1/8 of the code.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-12-31 01:26:53 -08:00
parent 4b4ee90e58
commit 0ae5f98c7b
1 changed files with 42 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
send-pack.c
View File

@ -14,100 +14,49 @@ static int send_all;
static int force_update; static int force_update;
static int use_thin_pack; static int use_thin_pack;
static void exec_pack_objects(void) /*
* Make a pack stream and spit it out into file descriptor fd
*/
static int pack_objects(int fd, struct ref *refs)
{ {
int pipe_fd[2];
pid_t pid;
if (pipe(pipe_fd) < 0)
return error("send-pack: pipe failed");
pid = fork();
if (!pid) {
/*
* The child becomes pack-objects --revs; we feed
* the revision parameters to it via its stdin and
* let its stdout go back to the other end.
*/
static const char *args[] = { static const char *args[] = {
"pack-objects", "pack-objects",
"--all-progress", "--all-progress",
"--revs",
"--stdout", "--stdout",
NULL NULL,
NULL,
}; };
execv_git_cmd(args); if (use_thin_pack)
die("git-pack-objects exec failed (%s)", strerror(errno)); args[4] = "--thin";
}
static void exec_rev_list(struct ref *refs)
{
static const char *args[4];
int i = 0;
args[i++] = "rev-list"; /* 0 */
if (use_thin_pack) /* 1 */
args[i++] = "--objects-edge";
else
args[i++] = "--objects";
args[i++] = "--stdin";
args[i] = NULL;
execv_git_cmd(args);
die("git-rev-list exec failed (%s)", strerror(errno));
}
/*
* Run "rev-list --stdin | pack-objects" pipe.
*/
static void rev_list(struct ref *refs)
{
int pipe_fd[2];
pid_t pack_objects_pid;
if (pipe(pipe_fd) < 0)
die("rev-list setup: pipe failed");
pack_objects_pid = fork();
if (!pack_objects_pid) {
/* The child becomes pack-objects; reads from pipe
* and writes to the original fd
*/
dup2(pipe_fd[0], 0);
close(pipe_fd[0]);
close(pipe_fd[1]);
exec_pack_objects();
die("pack-objects setup failed");
}
if (pack_objects_pid < 0)
die("pack-objects fork failed");
/* We become rev-list --stdin; output goes to pipe. */
dup2(pipe_fd[1], 1);
close(pipe_fd[0]);
close(pipe_fd[1]);
exec_rev_list(refs);
}
/*
* Create "rev-list --stdin | pack-objects" pipe and feed
* the refs into the pipeline.
*/
static void rev_list_generate(int fd, struct ref *refs)
{
int pipe_fd[2];
pid_t rev_list_generate_pid;
if (pipe(pipe_fd) < 0)
die("rev-list-generate setup: pipe failed");
rev_list_generate_pid = fork();
if (!rev_list_generate_pid) {
/* The child becomes the "rev-list | pack-objects"
* pipeline. It takes input from us, and its output
* goes to fd.
*/
dup2(pipe_fd[0], 0); dup2(pipe_fd[0], 0);
dup2(fd, 1); dup2(fd, 1);
close(pipe_fd[0]); close(pipe_fd[0]);
close(pipe_fd[1]); close(pipe_fd[1]);
close(fd); close(fd);
rev_list(refs); execv_git_cmd(args);
die("rev-list setup failed"); die("git-pack-objects exec failed (%s)", strerror(errno));
} }
if (rev_list_generate_pid < 0)
die("rev-list-generate fork failed");
/* We feed the rev parameters to them. We do not write into /*
* fd nor read from the pipe. * We feed the pack-objects we just spawned with revision
* parameters by writing to the pipe.
*/ */
close(pipe_fd[0]); close(pipe_fd[0]);
close(fd); close(fd);
while (refs) { while (refs) {
char buf[42]; char buf[42];
@ -126,28 +75,24 @@ static void rev_list_generate(int fd, struct ref *refs)
refs = refs->next; refs = refs->next;
} }
close(pipe_fd[1]); close(pipe_fd[1]);
// waitpid(rev_list_generate_pid);
exit(0);
}
/* for (;;) {
* Make a pack stream and spit it out into file descriptor fd int status, code;
*/ pid_t waiting = waitpid(pid, &status, 0);
static void pack_objects(int fd, struct ref *refs)
{
pid_t rev_list_pid;
rev_list_pid = fork(); if (waiting < 0) {
if (!rev_list_pid) { if (errno == EINTR)
rev_list_generate(fd, refs); continue;
die("rev-list setup failed"); return error("waitpid failed (%s)", strerror(errno));
}
if ((waiting != pid) || WIFSIGNALED(status) ||
!WIFEXITED(status))
return error("pack-objects died with strange error");
code = WEXITSTATUS(status);
if (code)
return -code;
return 0;
} }
if (rev_list_pid < 0)
die("rev-list fork failed");
/*
* We don't wait for the rev-list pipeline in the parent:
* we end up waiting for the other end instead
*/
} }
static void unmark_and_free(struct commit_list *list, unsigned int mark) static void unmark_and_free(struct commit_list *list, unsigned int mark)
@ -379,7 +324,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
packet_flush(out); packet_flush(out);
if (new_refs) if (new_refs)
pack_objects(out, remote_refs); ret = pack_objects(out, remote_refs);
close(out); close(out);
if (expect_status_report) { if (expect_status_report) {