Improve stpncpy performance by using __strnlen/memcpy/memset rather than a

byte loop. Performance on bench-stpncpy is ~2x faster on average.

diff --git a/ChangeLog b/ChangeLog
index da4f3c75bd761144acf16f323fce25f658b57a72..23760214abc65bb16ef93eae64f6cc9f98e98c71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-19  Wilco Dijkstra  <wdijkstr@arm.com>
+
+       * string/stpncpy.c (stpncpy): Improve performance using
+       __strnlen/memcpy/memset.
+
 2015-08-19  Andrew Senkevich  <andrew.senkevich@intel.com>
 
        [BZ #18796]

diff --git a/string/stpncpy.c b/string/stpncpy.c
index eb65a5f46f871799a130fadab015f3c3f2b785ab..4c3351ba0184eaa922f90c6e352bc78eac607c58 100644 (file)
--- a/string/stpncpy.c
+++ b/string/stpncpy.c
@@ -15,8 +15,6 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-/* This is almost copied from strncpy.c, written by Torbjorn Granlund.  */
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -41,59 +39,12 @@ weak_alias (__stpncpy, stpncpy)
 char *
 STPNCPY (char *dest, const char *src, size_t n)
 {
-  char c;
-  char *s = dest;
-
-  if (n >= 4)
-    {
-      size_t n4 = n >> 2;
-
-      for (;;)
-       {
-         c = *src++;
-         *dest++ = c;
-         if (c == '\0')
-           break;
-         c = *src++;
-         *dest++ = c;
-         if (c == '\0')
-           break;
-         c = *src++;
-         *dest++ = c;
-         if (c == '\0')
-           break;
-         c = *src++;
-         *dest++ = c;
-         if (c == '\0')
-           break;
-         if (--n4 == 0)
-           goto last_chars;
-       }
-      n -= dest - s;
-      goto zero_fill;
-    }
-
- last_chars:
-  n &= 3;
-  if (n == 0)
+  size_t size = __strnlen (src, n);
+  memcpy (dest, src, size);
+  dest += size;
+  if (size == n)
     return dest;
-
-  for (;;)
-    {
-      c = *src++;
-      --n;
-      *dest++ = c;
-      if (c == '\0')
-       break;
-      if (n == 0)
-       return dest;
-    }
-
- zero_fill:
-  while (n-- > 0)
-    dest[n] = '\0';
-
-  return dest - 1;
+  return memset (dest, '\0', n - size);
 }
 #ifdef weak_alias
 libc_hidden_def (__stpncpy)