proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 20:29:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1268 from phkelley/development

Browse Source 
A simple perf optimization in pack-objects.c
This commit is contained in:
Vicent Martí 2013-01-22 09:20:09 -08:00
commit 148c786cd6
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pack-objects.c
View File

@ -30,6 +30,11 @@ struct unpacked {
unsigned int depth; unsigned int depth;
}; };
struct tree_walk_context {
git_packbuilder *pb;
git_buf buf;
};
#ifdef GIT_THREADS #ifdef GIT_THREADS
#define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \ #define GIT_PACKBUILDER__MUTEX_OP(pb, mtx, op) do { \
@ -1259,40 +1264,38 @@ int git_packbuilder_write(git_packbuilder *pb, const char *path)
static int cb_tree_walk(const char *root, const git_tree_entry *entry, void *payload) static int cb_tree_walk(const char *root, const git_tree_entry *entry, void *payload)
{ {
git_packbuilder *pb = payload; struct tree_walk_context *ctx = payload;
git_buf buf = GIT_BUF_INIT;
/* A commit inside a tree represents a submodule commit and should be skipped. */ /* A commit inside a tree represents a submodule commit and should be skipped. */
if(git_tree_entry_type(entry) == GIT_OBJ_COMMIT) if (git_tree_entry_type(entry) == GIT_OBJ_COMMIT)
return 0; return 0;
git_buf_puts(&buf, root); if (git_buf_sets(&ctx->buf, root) < 0 ||
git_buf_puts(&buf, git_tree_entry_name(entry)); git_buf_puts(&ctx->buf, git_tree_entry_name(entry)) < 0)
if (git_packbuilder_insert(pb, git_tree_entry_id(entry),
git_buf_cstr(&buf)) < 0) {
git_buf_free(&buf);
return -1; return -1;
}
git_buf_free(&buf); return git_packbuilder_insert(ctx->pb,
return 0; git_tree_entry_id(entry),
git_buf_cstr(&ctx->buf));
} }
int git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *oid) int git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *oid)
{ {
git_tree *tree; git_tree *tree;
struct tree_walk_context context = { pb, GIT_BUF_INIT };
if (git_tree_lookup(&tree, pb->repo, oid) < 0 || if (git_tree_lookup(&tree, pb->repo, oid) < 0 ||
git_packbuilder_insert(pb, oid, NULL) < 0) git_packbuilder_insert(pb, oid, NULL) < 0)
return -1; return -1;
if (git_tree_walk(tree, GIT_TREEWALK_PRE, cb_tree_walk, pb) < 0) { if (git_tree_walk(tree, GIT_TREEWALK_PRE, cb_tree_walk, &context) < 0) {
git_tree_free(tree); git_tree_free(tree);
git_buf_free(&context.buf);
return -1; return -1;
} }
git_tree_free(tree); git_tree_free(tree);
git_buf_free(&context.buf);
return 0; return 0;
} }