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

Merge branch 'nd/fix-directory-attrs-off-by-one' into maint

Browse Source 
The attribute mechanism didn't allow limiting attributes to be
applied to only a single directory itself with "path/" like the
exclude mechanism does.  The initial implementation of this that was
merged to 'maint' and 1.8.1.1 had severe performance degradations.

* nd/fix-directory-attrs-off-by-one:
  attr: avoid calling find_basename() twice per path
  attr: fix off-by-one directory component length calculation
This commit is contained in:
Junio C Hamano 2013-01-29 11:18:54 -08:00
commit 025ea586e6
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
attr.c
View File

@ -564,25 +564,12 @@ static void bootstrap_attr_stack(void)
attr_stack = elem; attr_stack = elem;
} }
static const char *find_basename(const char *path) static void prepare_attr_stack(const char *path, int dirlen)
{
const char *cp, *last_slash = NULL;
for (cp = path; *cp; cp++) {
if (*cp == '/' && cp[1])
last_slash = cp;
}
return last_slash ? last_slash + 1 : path;
}
static void prepare_attr_stack(const char *path)
{ {
struct attr_stack *elem, *info; struct attr_stack *elem, *info;
int dirlen, len; int len;
const char *cp; const char *cp;
dirlen = find_basename(path) - path;
/* /*
* At the bottom of the attribute stack is the built-in * At the bottom of the attribute stack is the built-in
* set of attribute definitions, followed by the contents * set of attribute definitions, followed by the contents
@ -762,15 +749,26 @@ static int macroexpand_one(int attr_nr, int rem)
static void collect_all_attrs(const char *path) static void collect_all_attrs(const char *path)
{ {
struct attr_stack *stk; struct attr_stack *stk;
int i, pathlen, rem; int i, pathlen, rem, dirlen;
const char *basename; const char *basename, *cp, *last_slash = NULL;
prepare_attr_stack(path); for (cp = path; *cp; cp++) {
if (*cp == '/' && cp[1])
last_slash = cp;
}
pathlen = cp - path;
if (last_slash) {
basename = last_slash + 1;
dirlen = last_slash - path;
} else {
basename = path;
dirlen = 0;
}
prepare_attr_stack(path, dirlen);
for (i = 0; i < attr_nr; i++) for (i = 0; i < attr_nr; i++)
check_all_attr[i].value = ATTR__UNKNOWN; check_all_attr[i].value = ATTR__UNKNOWN;
basename = find_basename(path);
pathlen = strlen(path);
rem = attr_nr; rem = attr_nr;
for (stk = attr_stack; 0 < rem && stk; stk = stk->prev) for (stk = attr_stack; 0 < rem && stk; stk = stk->prev)
rem = fill(path, pathlen, basename, stk, rem); rem = fill(path, pathlen, basename, stk, rem);