Merge branch 'ds/for-each-file-in-obj-micro-optim'

Git fork

The code to iterate over loose object files got optimized.

* ds/for-each-file-in-obj-micro-optim:
sha1_file: use strbuf_add() instead of strbuf_addf()

Junio C Hamano 8 years ago 97e1f857 36ddee94

+11 -5

2 changed files

expand all

sha1_file.c

perf

p4211-line-log.sh

+7 -5

sha1_file.c

··· 1964 1964 origlen = path->len; 1965 1965 strbuf_complete(path, '/'); 1966 1966 strbuf_addf(path, "%02x", subdir_nr); 1967 - baselen = path->len; 1968 1967 1969 1968 dir = opendir(path->buf); 1970 1969 if (!dir) { ··· 1975 1974 } 1976 1975 1977 1976 oid.hash[0] = subdir_nr; 1977 + strbuf_addch(path, '/'); 1978 + baselen = path->len; 1978 1979 1979 1980 while ((de = readdir(dir))) { 1981 + size_t namelen; 1980 1982 if (is_dot_or_dotdot(de->d_name)) 1981 1983 continue; 1982 1984 1985 + namelen = strlen(de->d_name); 1983 1986 strbuf_setlen(path, baselen); 1984 - strbuf_addf(path, "/%s", de->d_name); 1985 - 1986 - if (strlen(de->d_name) == GIT_SHA1_HEXSZ - 2 && 1987 + strbuf_add(path, de->d_name, namelen); 1988 + if (namelen == GIT_SHA1_HEXSZ - 2 && 1987 1989 !hex_to_bytes(oid.hash + 1, de->d_name, 1988 1990 GIT_SHA1_RAWSZ - 1)) { 1989 1991 if (obj_cb) { ··· 2002 2004 } 2003 2005 closedir(dir); 2004 2006 2005 - strbuf_setlen(path, baselen); 2007 + strbuf_setlen(path, baselen - 1); 2006 2008 if (!r && subdir_cb) 2007 2009 r = subdir_cb(subdir_nr, path->buf, data); 2008 2010

t/perf/p4211-line-log.sh

··· 35 35 git log --oneline --raw --parents >/dev/null 36 36 ' 37 37 38 + test_perf 'git log --oneline --raw --parents -1000' ' 39 + git log --oneline --raw --parents -1000 >/dev/null 40 + ' 41 + 38 42 test_done