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

blame.c: prepare_lines should not call xrealloc for every line

Browse Source 
Making a single preparation run for counting the lines will avoid memory
fragmentation.  Also, fix the allocated memory size which was wrong
when sizeof(int *) != sizeof(int), and would have been too small
for sizeof(int *) < sizeof(int), admittedly unlikely.

Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Kastrup 2014-02-12 15:27:24 +01:00 committed by Junio C Hamano
parent 62cf3ca95a
commit 352bbbd9f2
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
builtin/blame.c
View File

@ -1756,25 +1756,41 @@ static int prepare_lines(struct scoreboard *sb)
{ {
const char *buf = sb->final_buf; const char *buf = sb->final_buf;
unsigned long len = sb->final_buf_size; unsigned long len = sb->final_buf_size;
int num = 0, incomplete = 0, bol = 1; const char *end = buf + len;
const char *p;
int *lineno;
int num = 0, incomplete = 0;
if (len && buf[len-1] != '\n') for (p = buf;;) {
incomplete++; /* incomplete line at the end */ p = memchr(p, '\n', end - p);
while (len--) { if (p) {
if (bol) { p++;
sb->lineno = xrealloc(sb->lineno,
sizeof(int) * (num + 1));
sb->lineno[num] = buf - sb->final_buf;
bol = 0;
}
if (*buf++ == '\n') {
num++; num++;
bol = 1; continue;
} }
break;
} }
sb->lineno = xrealloc(sb->lineno,
sizeof(int) * (num + incomplete + 1)); if (len && end[-1] != '\n')
sb->lineno[num + incomplete] = buf - sb->final_buf; incomplete++; /* incomplete line at the end */
sb->lineno = xmalloc(sizeof(*sb->lineno) * (num + incomplete + 1));
lineno = sb->lineno;
*lineno++ = 0;
for (p = buf;;) {
p = memchr(p, '\n', end - p);
if (p) {
p++;
*lineno++ = p - buf;
continue;
}
break;
}
if (incomplete)
*lineno++ = len;
sb->num_lines = num + incomplete; sb->num_lines = num + incomplete;
return sb->num_lines; return sb->num_lines;
} }