From f29ac72effae859140bb0d7fffdb1e6cef0ffed0 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Wed, 5 Aug 2015 15:24:06 +0100 Subject: Improve memccpy performance by using memchr/memcpy/mempcpy rather than a byte loop. Overall performance on bench-memccpy is > 2x faster when using the C implementation of memchr and an optimized memcpy. --- ChangeLog | 5 +++++ string/memccpy.c | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f40e4e015..65592c3e80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-05 Wilco Dijkstra + + * string/memccpy.c (memccpy): + Improve performance by using memchr/memcpy/__mempcpy. + 2015-08-05 Wilco Dijkstra * string/strncpy.c (strncpy): diff --git a/string/memccpy.c b/string/memccpy.c index d9ed6975ef..0987c84aa0 100644 --- a/string/memccpy.c +++ b/string/memccpy.c @@ -26,15 +26,12 @@ void * __memccpy (void *dest, const void *src, int c, size_t n) { - const char *s = src; - char *d = dest; - const char x = c; - size_t i = n; + void *p = memchr (src, c, n); - while (i-- > 0) - if ((*d++ = *s++) == x) - return d; + if (p != NULL) + return __mempcpy (dest, src, p - src + 1); + memcpy (dest, src, n); return NULL; } -- cgit 1.4.1