# HG changeset patch # User Bruno Haible # Date 1295615207 -3600 # Node ID 613f9258ecc8440de7b60419a108a98285d33784 # Parent 2620b4196c4801914cdf3f7a5ba83bdb9e8ba07a Make uN_strstr functions O(n) worst-case. * lib/unistr/u-strstr.h (FUNC): In the 8-bit case, use strstr. In the 16-bit and 32-bit unit cases, use the unibyte algorithm from lib/mbsstr.c. * lib/unistr/u8-strstr.c: Include . (UNIT_IS_UINT8_T): New macro. * lib/unistr/u16-strstr.c: Include malloca.h and str-kmp.h. (U_STRLEN, U_STRNLEN): New macros. * lib/unistr/u32-strstr.c: Include malloca.h and str-kmp.h. (U_STRLEN, U_STRNLEN): New macros. * modules/unistr/u8-strstr (Depends-on): Add strstr. (configure.ac): Update required libunistring version. * modules/unistr/u16-strstr (Files): Add lib/str-kmp.h. (Depends-on): Add unistr/u16-strlen, unistr/u16-strnlen, stdbool, malloca. (configure.ac): Update required libunistring version. * modules/unistr/u32-strstr (Files): Add lib/str-kmp.h. (Depends-on): Add unistr/u32-strlen, unistr/u32-strnlen, stdbool, malloca. (configure.ac): Update required libunistring version. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2011-01-21 Pádraig Brady + Bruno Haible + + Make uN_strstr functions O(n) worst-case. + * lib/unistr/u-strstr.h (FUNC): In the 8-bit case, use strstr. In the + 16-bit and 32-bit unit cases, use the unibyte algorithm from + lib/mbsstr.c. + * lib/unistr/u8-strstr.c: Include . + (UNIT_IS_UINT8_T): New macro. + * lib/unistr/u16-strstr.c: Include malloca.h and str-kmp.h. + (U_STRLEN, U_STRNLEN): New macros. + * lib/unistr/u32-strstr.c: Include malloca.h and str-kmp.h. + (U_STRLEN, U_STRNLEN): New macros. + * modules/unistr/u8-strstr (Depends-on): Add strstr. + (configure.ac): Update required libunistring version. + * modules/unistr/u16-strstr (Files): Add lib/str-kmp.h. + (Depends-on): Add unistr/u16-strlen, unistr/u16-strnlen, stdbool, + malloca. + (configure.ac): Update required libunistring version. + * modules/unistr/u32-strstr (Files): Add lib/str-kmp.h. + (Depends-on): Add unistr/u32-strlen, unistr/u32-strnlen, stdbool, + malloca. + (configure.ac): Update required libunistring version. + 2011-01-21 Pádraig Brady Bruno Haible diff --git a/lib/unistr/u-strstr.h b/lib/unistr/u-strstr.h --- a/lib/unistr/u-strstr.h +++ b/lib/unistr/u-strstr.h @@ -1,6 +1,6 @@ /* Substring test for UTF-8/UTF-16/UTF-32 strings. Copyright (C) 1999, 2002, 2006, 2010-2011 Free Software Foundation, Inc. - Written by Bruno Haible , 2002. + Written by Bruno Haible , 2002, 2005. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published @@ -38,22 +38,94 @@ } #endif - /* Search for needle's first unit. */ - for (; *haystack != 0; haystack++) - if (*haystack == first) +#if UNIT_IS_UINT8_T + return (uint8_t *) strstr ((const char *) haystack, (const char *) needle); +#else + { + /* Minimizing the worst-case complexity: + Let n = U_STRLEN(haystack), m = U_STRLEN(needle). + The naïve algorithm is O(n*m) worst-case. + The Knuth-Morris-Pratt algorithm is O(n) worst-case but it needs a + memory allocation. + To achieve linear complexity and yet amortize the cost of the + memory allocation, we activate the Knuth-Morris-Pratt algorithm + only once the naïve algorithm has already run for some time; more + precisely, when + - the outer loop count is >= 10, + - the average number of comparisons per outer loop is >= 5, + - the total number of comparisons is >= m. + But we try it only once. If the memory allocation attempt failed, + we don't retry it. */ + bool try_kmp = true; + size_t outer_loop_count = 0; + size_t comparison_count = 0; + size_t last_ccount = 0; /* last comparison count */ + const UNIT *needle_last_ccount = needle; /* = needle + last_ccount */ + + /* Speed up the following searches of needle by caching its first + character. */ + UNIT b = *needle++; + + for (;; haystack++) { - /* Compare with needle's remaining units. */ - const UNIT *hptr = haystack + 1; - const UNIT *nptr = needle + 1; - for (;;) + if (*haystack == 0) + /* No match. */ + return NULL; + + /* See whether it's advisable to use an asymptotically faster + algorithm. */ + if (try_kmp + && outer_loop_count >= 10 + && comparison_count >= 5 * outer_loop_count) { - if (*hptr != *nptr) - break; - hptr++; nptr++; - if (*nptr == 0) - return (UNIT *) haystack; + /* See if needle + comparison_count now reaches the end of + needle. */ + if (needle_last_ccount != NULL) + { + needle_last_ccount += + U_STRNLEN (needle_last_ccount, + comparison_count - last_ccount); + if (*needle_last_ccount == 0) + needle_last_ccount = NULL; + last_ccount = comparison_count; + } + if (needle_last_ccount == NULL) + { + /* Try the Knuth-Morris-Pratt algorithm. */ + const UNIT *result; + bool success = + knuth_morris_pratt (haystack, + needle - 1, U_STRLEN (needle - 1), + &result); + if (success) + return (UNIT *) result; + try_kmp = false; + } + } + + outer_loop_count++; + comparison_count++; + if (*haystack == b) + /* The first character matches. */ + { + const UNIT *rhaystack = haystack + 1; + const UNIT *rneedle = needle; + + for (;; rhaystack++, rneedle++) + { + if (*rneedle == 0) + /* Found a match. */ + return (UNIT *) haystack; + if (*rhaystack == 0) + /* No match. */ + return NULL; + comparison_count++; + if (*rhaystack != *rneedle) + /* Nothing in this round. */ + break; + } } } - - return NULL; + } +#endif } diff --git a/lib/unistr/u16-strstr.c b/lib/unistr/u16-strstr.c --- a/lib/unistr/u16-strstr.c +++ b/lib/unistr/u16-strstr.c @@ -20,10 +20,18 @@ /* Specification. */ #include "unistr.h" +#include "malloca.h" + /* FIXME: Maybe walking the string via u16_mblen is a win? */ +#define UNIT uint16_t + +#define CANON_ELEMENT(c) c +#include "str-kmp.h" + #define FUNC u16_strstr -#define UNIT uint16_t #define U_STRCHR u16_strchr #define U_STRMBTOUC u16_strmbtouc +#define U_STRLEN u16_strlen +#define U_STRNLEN u16_strnlen #include "u-strstr.h" diff --git a/lib/unistr/u32-strstr.c b/lib/unistr/u32-strstr.c --- a/lib/unistr/u32-strstr.c +++ b/lib/unistr/u32-strstr.c @@ -20,7 +20,15 @@ /* Specification. */ #include "unistr.h" -#define FUNC u32_strstr +#include "malloca.h" + #define UNIT uint32_t + +#define CANON_ELEMENT(c) c +#include "str-kmp.h" + +#define FUNC u32_strstr #define U_STRCHR u32_strchr +#define U_STRLEN u32_strlen +#define U_STRNLEN u32_strnlen #include "u-strstr.h" diff --git a/lib/unistr/u8-strstr.c b/lib/unistr/u8-strstr.c --- a/lib/unistr/u8-strstr.c +++ b/lib/unistr/u8-strstr.c @@ -20,10 +20,13 @@ /* Specification. */ #include "unistr.h" +#include + /* FIXME: Maybe walking the string via u8_mblen is a win? */ #define FUNC u8_strstr #define UNIT uint8_t #define U_STRCHR u8_strchr #define U_STRMBTOUC u8_strmbtouc +#define UNIT_IS_UINT8_T 1 #include "u-strstr.h" diff --git a/modules/unistr/u16-strstr b/modules/unistr/u16-strstr --- a/modules/unistr/u16-strstr +++ b/modules/unistr/u16-strstr @@ -4,14 +4,19 @@ Files: lib/unistr/u16-strstr.c lib/unistr/u-strstr.h +lib/str-kmp.h Depends-on: unistr/base unistr/u16-strchr unistr/u16-strmbtouc +unistr/u16-strlen +unistr/u16-strnlen +stdbool +malloca configure.ac: -gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strstr]) +gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u16-strstr]) Makefile.am: if LIBUNISTRING_COMPILE_UNISTR_U16_STRSTR diff --git a/modules/unistr/u32-strstr b/modules/unistr/u32-strstr --- a/modules/unistr/u32-strstr +++ b/modules/unistr/u32-strstr @@ -4,13 +4,18 @@ Files: lib/unistr/u32-strstr.c lib/unistr/u-strstr.h +lib/str-kmp.h Depends-on: unistr/base unistr/u32-strchr +unistr/u32-strlen +unistr/u32-strnlen +stdbool +malloca configure.ac: -gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strstr]) +gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u32-strstr]) Makefile.am: if LIBUNISTRING_COMPILE_UNISTR_U32_STRSTR diff --git a/modules/unistr/u8-strstr b/modules/unistr/u8-strstr --- a/modules/unistr/u8-strstr +++ b/modules/unistr/u8-strstr @@ -9,9 +9,10 @@ unistr/base unistr/u8-strchr unistr/u8-strmbtouc +strstr configure.ac: -gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strstr]) +gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-strstr]) Makefile.am: if LIBUNISTRING_COMPILE_UNISTR_U8_STRSTR