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

git-upload-pack: More efficient usage of the has_sha1 array

Browse Source 
This patch is based on Junio's proposal. It marks parents of common revs
so that they do not clutter up the has_sha1 array.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin
2005-10-28 04:48:32 +02:00
committed by Junio C Hamano
parent eebda31d21
commit f0243f26f6
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
upload-pack.c
View File

@ -3,9 +3,11 @@
#include "pkt-line.h" #include "pkt-line.h"
#include "tag.h" #include "tag.h"
#include "object.h" #include "object.h"
#include "commit.h"
static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>"; static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
#define THEY_HAVE (1U << 0)
#define OUR_REF (1U << 1) #define OUR_REF (1U << 1)
#define WANTED (1U << 2) #define WANTED (1U << 2)
#define MAX_HAS 256 #define MAX_HAS 256
@ -89,15 +91,27 @@ static void create_pack_file(void)
static int got_sha1(char *hex, unsigned char *sha1) static int got_sha1(char *hex, unsigned char *sha1)
{ {
int nr;
if (get_sha1_hex(hex, sha1)) if (get_sha1_hex(hex, sha1))
die("git-upload-pack: expected SHA1 object, got '%s'", hex); die("git-upload-pack: expected SHA1 object, got '%s'", hex);
if (!has_sha1_file(sha1)) if (!has_sha1_file(sha1))
return 0; return 0;
nr = nr_has; if (nr_has < MAX_HAS) {
if (nr < MAX_HAS) { struct object *o = lookup_object(sha1);
memcpy(has_sha1[nr], sha1, 20); if (!(o && o->parsed))
nr_has = nr+1; o = parse_object(sha1);
if (!o)
die("oops (%s)", sha1_to_hex(sha1));
if (o->type == commit_type) {
struct commit_list *parents;
if (o->flags & THEY_HAVE)
return 0;
o->flags |= THEY_HAVE;
for (parents = ((struct commit*)o)->parents;
parents;
parents = parents->next)
parents->item->object.flags |= THEY_HAVE;
}
memcpy(has_sha1[nr_has++], sha1, 20);
} }
return 1; return 1;
} }
@ -108,6 +122,9 @@ static int get_common_commits(void)
unsigned char sha1[20]; unsigned char sha1[20];
int len; int len;
track_object_refs = 0;
save_commit_buffer = 0;
for(;;) { for(;;) {
len = packet_read_line(0, line, sizeof(line)); len = packet_read_line(0, line, sizeof(line));
reset_timeout(); reset_timeout();