Skip to content

Commit

Permalink
optimize compat/ memmem()
Browse files Browse the repository at this point in the history
When memmem() was imported from glibc 2.2 into compat/, an optimization
was dropped in the process, in order to make the code smaller and simpler.
It was OK because memmem() wasn't used in performance-critical code.  Now
the situation has changed and we can benefit from this optimization.

The trick is to avoid calling memcmp() if the first character of the needle
already doesn't match.  Checking one character directly is much cheaper
than the function call overhead.  We keep the first character of the needle
in the variable named point and the rest in the one named tail.

The following commands were run in a Linux kernel repository and timed, the
best of five results is shown:

  $ STRING='Ensure that the real time constraints are schedulable.'
  $ git log -S"$STRING" HEAD -- kernel/sched.c >/dev/null

On Windows Vista x64, before:

  real    0m8.470s
  user    0m0.000s
  sys     0m0.000s

And after the patch:

  real    0m1.887s
  user    0m0.000s
  sys     0m0.000s

Signed-off-by: Rene Scharfe <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
René Scharfe authored and gitster committed Mar 3, 2009
1 parent ce163c7 commit 56384e6
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion compat/memmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ void *gitmemmem(const void *haystack, size_t haystack_len,
{
const char *begin = haystack;
const char *last_possible = begin + haystack_len - needle_len;
const char *tail = needle;
char point;

/*
* The first occurrence of the empty string is deemed to occur at
Expand All @@ -20,8 +22,9 @@ void *gitmemmem(const void *haystack, size_t haystack_len,
if (haystack_len < needle_len)
return NULL;

point = *tail++;
for (; begin <= last_possible; begin++) {
if (!memcmp(begin, needle, needle_len))
if (*begin == point && !memcmp(begin + 1, tail, needle_len - 1))
return (void *)begin;
}

Expand Down

0 comments on commit 56384e6

Please sign in to comment.