Author: matz Date: Thu Dec 27 18:32:46 2007 New Revision: 8148 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8148&view=rev Log: I'll have a need for inserting substrings into a stringpool. Modified: trunk/sat-solver/src/hash.h trunk/sat-solver/src/strpool.c trunk/sat-solver/src/strpool.h Modified: trunk/sat-solver/src/hash.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/hash.h?rev=8148&r1=8147&r2=8148&view=diff ============================================================================== --- trunk/sat-solver/src/hash.h (original) +++ trunk/sat-solver/src/hash.h Thu Dec 27 18:32:46 2007 @@ -41,6 +41,16 @@ return r; } +static inline Hashval +strnhash(const char *str, unsigned len) +{ + Hashval r = 0; + unsigned int c; + while (len-- && (c = *(const unsigned char *)str++) != 0) + r += (r << 3) + c; + return r; +} + /* hash for rel * rel -> hash */ Modified: trunk/sat-solver/src/strpool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/strpool.c?rev=8148&r1=8147&r2=8148&view=diff ============================================================================== --- trunk/sat-solver/src/strpool.c (original) +++ trunk/sat-solver/src/strpool.c Thu Dec 27 18:32:46 2007 @@ -37,7 +37,7 @@ } Id -stringpool_str2id (Stringpool *ss, const char *str, int create) +stringpool_strn2id (Stringpool *ss, const char *str, unsigned len, int create) { Hashval h; unsigned int hh; @@ -79,12 +79,13 @@ // compute hash and check for match - h = strhash(str) & hashmask; + h = strnhash(str, len) & hashmask; hh = HASHCHAIN_START; while ((id = hashtbl[h]) != 0) // follow hash overflow chain { // break if string already hashed - if(!strcmp(ss->stringspace + ss->strings[id], str)) + if(!memcmp(ss->stringspace + ss->strings[id], str, len) + && ss->stringspace[ss->strings[id] + len] == 0) break; h = HASHCHAIN_NEXT(h, hh, hashmask); } @@ -101,19 +102,29 @@ // 'pointer' into stringspace is Offset of next free pos: sstrings ss->strings[id] = ss->sstrings; - space_needed = strlen(str) + 1; + space_needed = len + 1; // resize string buffer if needed if (((ss->sstrings + space_needed - 1) | STRINGSPACE_BLOCK) != ((ss->sstrings - 1) | STRINGSPACE_BLOCK)) ss->stringspace = xrealloc(ss->stringspace, (ss->sstrings + space_needed + STRINGSPACE_BLOCK) & ~STRINGSPACE_BLOCK); // copy new string into buffer - memcpy(ss->stringspace + ss->sstrings, str, space_needed); + memcpy(ss->stringspace + ss->sstrings, str, space_needed - 1); + // add the sentinel, we can't rely on it being in the source string (in + // case the LEN is not really strlen(str)) + ss->stringspace[ss->sstrings + space_needed - 1] = 0; // next free pos is behind new string ss->sstrings += space_needed; return id; } +Id +stringpool_str2id (Stringpool *ss, const char *str, int create) +{ + unsigned len = strlen (str); + return stringpool_strn2id (ss, str, len, create); +} + void stringpool_shrink (Stringpool *ss) { Modified: trunk/sat-solver/src/strpool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/strpool.h?rev=8148&r1=8147&r2=8148&view=diff ============================================================================== --- trunk/sat-solver/src/strpool.h (original) +++ trunk/sat-solver/src/strpool.h Thu Dec 27 18:32:46 2007 @@ -26,6 +26,13 @@ void stringpool_init (Stringpool *ss, const char *strs[]); Id stringpool_str2id (Stringpool *ss, const char *str, int create); +Id stringpool_strn2id (Stringpool *ss, const char *str, unsigned len, int create); void stringpool_shrink (Stringpool *ss); +static inline const char * +stringpool_id2str (Stringpool *ss, Id id) +{ + return ss->stringspace + ss->strings[id]; +} + #endif -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org