mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-26 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-plain: more efficient walk_tree()

Browse Source 
Git's read_tree_recursive() already filters out the objects by pathname,
so we only have to compare baselen to the expected.  That is, no string
matching is required.

Additionally, if the requested path is a directory, the old code would
walk through all of its immediate children.  This is not necessary, this
so we no longer do that.

Signed-off-by: Mark Lodato <lodatom@gmail.com>
This commit is contained in:
Mark Lodato 2010-01-31 01:07:41 -05:00
parent 89082346d5
commit 74ebf82229
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui-plain.c
View File

@ -10,7 +10,7 @@
#include "html.h" #include "html.h"
#include "ui-shared.h" #include "ui-shared.h"
char *match_path; int match_baselen;
int match; int match;
static void print_object(const unsigned char *sha1, const char *path) static void print_object(const unsigned char *sha1, const char *path)
@ -56,13 +56,21 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned mode, int stage, const char *pathname, unsigned mode, int stage,
void *cbdata) void *cbdata)
{ {
if (S_ISDIR(mode)) if (baselen == match_baselen) {
if (S_ISREG(mode))
print_object(sha1, pathname);
}
else if (S_ISDIR(mode))
return READ_TREE_RECURSIVE; return READ_TREE_RECURSIVE;
if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && return 0;
!strcmp(pathname, match_path + baselen)) }
print_object(sha1, pathname);
static int basedir_len(const char *path)
{
char *p = strrchr(path, '/');
if (p)
return p - path + 1;
return 0; return 0;
} }
@ -85,7 +93,7 @@ void cgit_print_plain(struct cgit_context *ctx)
html_status(404, "Not found", 0); html_status(404, "Not found", 0);
return; return;
} }
match_path = ctx->qry.path; match_baselen = basedir_len(paths[0]);
read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
if (!match) if (!match)
html_status(404, "Not found", 0); html_status(404, "Not found", 0);