ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

liblog: add android_lookupEventFormat_len

Browse source 
am: 530711b39e

Change-Id: I62a33b249df6afdc4405a89b3f60a51a2897f98e
This commit is contained in:
Mark Salyzyn 2016-11-07 22:46:39 +00:00 • committed by android-build-merger
commit 494a394545
2 changed files with 61 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/log/event_tag_map.h
View file

@ -48,7 +48,15 @@ const char* android_lookupEventTag(const EventTagMap* map, unsigned int tag)
* Look up a tag by index. Returns the tag string & string length, or NULL if * Look up a tag by index. Returns the tag string & string length, or NULL if
* not found. Returned string is not guaranteed to be nul terminated. * not found. Returned string is not guaranteed to be nul terminated.
*/ */
const char* android_lookupEventTag_len(const EventTagMap* map, size_t* len, unsigned int tag); const char* android_lookupEventTag_len(const EventTagMap* map,
size_t* len, unsigned int tag);
/*
* Look up a format by index. Returns the format string & string length,
* or NULL if not found. Returned string is not guaranteed to be nul terminated.
*/
const char* android_lookupEventFormat_len(const EventTagMap* map,
size_t* len, unsigned int tag);
#ifdef __cplusplus #ifdef __cplusplus
} }

63
liblog/event_tag_map.c
View file

@ -38,6 +38,8 @@ typedef struct EventTag {
uint32_t tagIndex; uint32_t tagIndex;
char* tagStr; char* tagStr;
size_t tagLen; size_t tagLen;
char* fmtStr;
size_t fmtLen;
} EventTag; } EventTag;
/* /*
@ -176,6 +178,39 @@ LIBLOG_ABI_PUBLIC const char* android_lookupEventTag_len(const EventTagMap* map,
return NULL; return NULL;
} }
/*
* Look up an entry in the map.
*
* The entries are sorted by tag number, so we can do a binary search.
*/
LIBLOG_ABI_PUBLIC const char* android_lookupEventFormat_len(
const EventTagMap* map, size_t *len, unsigned int tag)
{
int lo = 0;
int hi = map->numTags - 1;
while (lo <= hi) {
int mid = (lo + hi) / 2;
int cmp = map->tagArray[mid].tagIndex - tag;
if (cmp < 0) {
/* tag is bigger */
lo = mid + 1;
} else if (cmp > 0) {
/* tag is smaller */
hi = mid - 1;
} else {
/* found */
if (len) *len = map->tagArray[mid].fmtLen;
return map->tagArray[mid].fmtStr;
}
}
errno = ENOENT;
if (len) *len = 0;
return NULL;
}
LIBLOG_ABI_PUBLIC const char* android_lookupEventTag(const EventTagMap* map, LIBLOG_ABI_PUBLIC const char* android_lookupEventTag(const EventTagMap* map,
unsigned int tag) unsigned int tag)
{ {
@ -364,17 +399,21 @@ static int scanTagLine(char** pData, EventTag* tag, int lineNum)
} }
tag->tagLen = cp - tag->tagStr; tag->tagLen = cp - tag->tagStr;
if (isspace(*cp)) { if (!isspace(*cp)) {
/* just ignore the rest of the line till \n
TODO: read the tag description that follows the tag name
*/
while (*cp != '\n') ++cp;
} else {
fprintf(stderr, "%s: invalid tag chars on line %d\n", OUT_TAG, lineNum); fprintf(stderr, "%s: invalid tag chars on line %d\n", OUT_TAG, lineNum);
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
while (isspace(*cp) && (*cp != '\n')) ++cp;
if (*cp != '#') {
tag->fmtStr = cp;
while ((*cp != '\n') && (*cp != '#')) ++cp;
while ((cp > tag->fmtStr) && isspace(*(cp - 1))) --cp;
tag->fmtLen = cp - tag->fmtStr;
}
while (*cp != '\n') ++cp;
*pData = cp; *pData = cp;
return 0; return 0;
@ -406,12 +445,14 @@ static int sortTags(EventTagMap* map)
for (i = 1; i < map->numTags; i++) { for (i = 1; i < map->numTags; i++) {
if (map->tagArray[i].tagIndex == map->tagArray[i - 1].tagIndex) { if (map->tagArray[i].tagIndex == map->tagArray[i - 1].tagIndex) {
fprintf(stderr, fprintf(stderr,
"%s: duplicate tag entries (%" PRIu32 ":%.*s and %" PRIu32 ":%.*s)\n", "%s: duplicate tag entries (%" PRIu32 ":%.*s:%.*s and %" PRIu32 ":%.*s:%.*s)\n",
OUT_TAG, OUT_TAG,
map->tagArray[i].tagIndex, (int)map->tagArray[i].tagLen, map->tagArray[i].tagIndex,
map->tagArray[i].tagStr, (int)map->tagArray[i].tagLen, map->tagArray[i].tagStr,
map->tagArray[i - 1].tagIndex, (int)map->tagArray[i - 1].tagLen, (int)map->tagArray[i].fmtLen, map->tagArray[i].fmtStr,
map->tagArray[i - 1].tagStr); map->tagArray[i - 1].tagIndex,
(int)map->tagArray[i - 1].tagLen, map->tagArray[i - 1].fmtStr,
(int)map->tagArray[i - 1].fmtLen, map->tagArray[i - 1].fmtStr);
errno = EMLINK; errno = EMLINK;
return -1; return -1;
} }