mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
d58ab810a6
calls strcspn, call strcspn directly so we get the end of the token without an extra call to rawmemchr. Also avoid an unnecessary call to strcspn after the last token by adding an early exit for an empty string. Change strtok to tailcall strtok_r to avoid unnecessary code duplication. Remove the special header optimization for strtok_r of a 1-character constant string - both strspn and strcspn contain optimizations for this case. Benchmarking this showed similar performance in the worst case, but up to 5.5x better performance in the "found" case for large inputs. * benchtests/bench-strtok.c (oldstrtok): Add old implementation. * string/strtok.c (strtok): Change to tailcall __strtok_r. * string/strtok_r.c (__strtok_r): Optimize for performance. * string/string-inlines.c (__old_strtok_r_1c): New function. * string/bits/string2.h (__strtok_r): Move to string-inlines.c.
36 lines
1.2 KiB
C
36 lines
1.2 KiB
C
/* Copyright (C) 1991-2016 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <string.h>
|
|
|
|
|
|
/* Parse S into tokens separated by characters in DELIM.
|
|
If S is NULL, the last string strtok() was called with is
|
|
used. For example:
|
|
char s[] = "-abc-=-def";
|
|
x = strtok(s, "-"); // x = "abc"
|
|
x = strtok(NULL, "-="); // x = "def"
|
|
x = strtok(NULL, "="); // x = NULL
|
|
// s = "abc\0=-def\0"
|
|
*/
|
|
char *
|
|
strtok (char *s, const char *delim)
|
|
{
|
|
static char *olds;
|
|
return __strtok_r (s, delim, &olds);
|
|
}
|