AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4084 Improve doOpenChoice performance.

Browse Source 
X-SVN-Rev: 16444
This commit is contained in:
George Rhoten 2004-10-11 21:21:55 +00:00
parent 4fbf096779
commit cf3b69cbf1
2 changed files with 123 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
icu4c/source/common/ucmndata.c
View File

@ -104,7 +104,8 @@ offsetTOCLookupFn(const UDataMemory *pData,
const UDataOffsetTOC *toc = (UDataOffsetTOC *)pData->toc; const UDataOffsetTOC *toc = (UDataOffsetTOC *)pData->toc;
if(toc!=NULL) { if(toc!=NULL) {
const char *base=(const char *)pData->toc; const char *base=(const char *)pData->toc;
uint32_t start, limit, number; uint32_t start, limit, number, lastNumber;
int32_t strResult;
/* perform a binary search for the data in the common data's table of contents */ /* perform a binary search for the data in the common data's table of contents */
#if defined (UDATA_DEBUG_DUMP) #if defined (UDATA_DEBUG_DUMP)
@ -116,36 +117,40 @@ offsetTOCLookupFn(const UDataMemory *pData,
start=0; start=0;
limit=toc->count; /* number of names in this table of contents */ limit=toc->count; /* number of names in this table of contents */
lastNumber=limit;
if (limit == 0) { /* Stub common data library used during build is empty. */ if (limit == 0) { /* Stub common data library used during build is empty. */
return NULL; return NULL;
} }
while(start<limit-1) { for (;;) {
number = (start+limit)/2; number = (start+limit)/2;
if(uprv_strcmp(tocEntryName, &base[toc->entry[number].nameOffset])<0) { if (lastNumber == number) { /* Have we moved? */
break; /* We haven't moved, and it wasn't found. */
}
lastNumber = number;
strResult = uprv_strcmp(tocEntryName, &base[toc->entry[number].nameOffset]);
if(strResult<0) {
limit=number; limit=number;
} else { } else if (strResult>0) {
start=number; start=number;
} }
} else {
if(uprv_strcmp(tocEntryName, &base[toc->entry[start].nameOffset])==0) {
/* found it */ /* found it */
#ifdef UDATA_DEBUG #ifdef UDATA_DEBUG
/* fprintf(stderr, "Found: %p\n",(base+toc[2*start+1])); */ /* fprintf(stderr, "Found: %p\n",(base+toc[2*start+1])); */
fprintf(stderr, "%s: Found.\n", tocEntryName); fprintf(stderr, "%s: Found.\n", tocEntryName);
#endif #endif
if((start+1)<toc->count) { if((number+1)<toc->count) {
*pLength=(int32_t)(toc->entry[start+1].dataOffset-toc->entry[start].dataOffset); *pLength=(int32_t)(toc->entry[number+1].dataOffset-toc->entry[number].dataOffset);
} else { } else {
*pLength=-1; *pLength=-1;
} }
return (const DataHeader *)&base[toc->entry[start].dataOffset]; return (const DataHeader *)&base[toc->entry[number].dataOffset];
} else { }
}
#ifdef UDATA_DEBUG #ifdef UDATA_DEBUG
fprintf(stderr, "%s: Not found.\n", tocEntryName); fprintf(stderr, "%s: Not found.\n", tocEntryName);
#endif #endif
return NULL; return NULL;
}
} else { } else {
#ifdef UDATA_DEBUG #ifdef UDATA_DEBUG
fprintf(stderr, "returning header\n"); fprintf(stderr, "returning header\n");

10
icu4c/source/common/udata.c
View File

@ -371,7 +371,7 @@ static void TinyString_append(TinyString *This, const char *what) {
} }
} }
if (newLen < This->fCapacity) { if (newLen < This->fCapacity) {
uprv_strcat(This->s, what); uprv_strcat(This->s+This->length, what);
This->length = newLen; This->length = newLen;
} }
} }
@ -392,7 +392,7 @@ static void TinyString_appendn(TinyString *This, const char *what, int32_t n) {
} }
} }
if (newLen < This->fCapacity) { if (newLen < This->fCapacity) {
uprv_strncat(This->s, what, n); uprv_strncat(This->s+This->length, what, n);
This->length = newLen; This->length = newLen;
} }
} }
@ -1058,7 +1058,6 @@ doOpenChoice(const char *path, const char *type, const char *name,
{ {
UDataMemory *retVal = NULL; UDataMemory *retVal = NULL;
UDataPathIterator iter;
const char *pathBuffer; const char *pathBuffer;
TinyString tocEntryName; /* entry name in tree format. ex: 'icudt28b/coll/ar.res' */ TinyString tocEntryName; /* entry name in tree format. ex: 'icudt28b/coll/ar.res' */
@ -1254,6 +1253,9 @@ doOpenChoice(const char *path, const char *type, const char *name,
dataPath = u_getDataDirectory(); dataPath = u_getDataDirectory();
/* Check to make sure that there is a dataPath to iterate over */
if (dataPath && *dataPath) {
UDataPathIterator iter;
/* #1a look in ind. files: package\nam.typ ========================= */ /* #1a look in ind. files: package\nam.typ ========================= */
/* init path iterator for individual files */ /* init path iterator for individual files */
udata_pathiter_init(&iter, dataPath, pkgName.s, path, tocEntryPathSuffix, FALSE); udata_pathiter_init(&iter, dataPath, pkgName.s, path, tocEntryPathSuffix, FALSE);
@ -1347,7 +1349,7 @@ doOpenChoice(const char *path, const char *type, const char *name,
#endif #endif
} }
udata_pathiter_dt(&iter); udata_pathiter_dt(&iter);
}
/* #2 */ /* #2 */