oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

TagPool: move code to tag_value_slot_p()

Browse Source
This commit is contained in:
Max Kellermann 2014-06-16 19:26:26 +02:00
parent adad4279f3
commit b2433a664c
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/tag/TagPool.cxx
View File

@ -93,13 +93,23 @@ tag_item_to_slot(TagItem *item)
return ContainerCast(item, TagPoolSlot, item); return ContainerCast(item, TagPoolSlot, item);
} }
static inline TagPoolSlot **
tag_value_slot_p(TagType type, const char *value, size_t length)
{
return &slots[calc_hash_n(type, value, length) % NUM_SLOTS];
}
static inline TagPoolSlot **
tag_value_slot_p(TagType type, const char *value)
{
return &slots[calc_hash(type, value) % NUM_SLOTS];
}
TagItem * TagItem *
tag_pool_get_item(TagType type, const char *value, size_t length) tag_pool_get_item(TagType type, const char *value, size_t length)
{ {
TagPoolSlot **slot_p, *slot; auto slot_p = tag_value_slot_p(type, value, length);
for (auto slot = *slot_p; slot != nullptr; slot = slot->next) {
slot_p = &slots[calc_hash_n(type, value, length) % NUM_SLOTS];
for (slot = *slot_p; slot != nullptr; slot = slot->next) {
if (slot->item.type == type && if (slot->item.type == type &&
length == strlen(slot->item.value) && length == strlen(slot->item.value) &&
memcmp(value, slot->item.value, length) == 0 && memcmp(value, slot->item.value, length) == 0 &&
@ -110,7 +120,7 @@ tag_pool_get_item(TagType type, const char *value, size_t length)
} }
} }
slot = TagPoolSlot::Create(*slot_p, type, value, length); auto slot = TagPoolSlot::Create(*slot_p, type, value, length);
*slot_p = slot; *slot_p = slot;
return &slot->item; return &slot->item;
} }
@ -129,9 +139,8 @@ tag_pool_dup_item(TagItem *item)
/* the reference counter overflows above 0xff; /* the reference counter overflows above 0xff;
duplicate the item, and start with 1 */ duplicate the item, and start with 1 */
size_t length = strlen(item->value); size_t length = strlen(item->value);
TagPoolSlot **slot_p = auto slot_p = tag_value_slot_p(item->type,
&slots[calc_hash_n(item->type, item->value, item->value, length);
length) % NUM_SLOTS];
slot = TagPoolSlot::Create(*slot_p, item->type, slot = TagPoolSlot::Create(*slot_p, item->type,
item->value, strlen(item->value)); item->value, strlen(item->value));
*slot_p = slot; *slot_p = slot;
@ -151,7 +160,7 @@ tag_pool_put_item(TagItem *item)
if (slot->ref > 0) if (slot->ref > 0)
return; return;
for (slot_p = &slots[calc_hash(item->type, item->value) % NUM_SLOTS]; for (slot_p = tag_value_slot_p(item->type, item->value);
*slot_p != slot; *slot_p != slot;
slot_p = &(*slot_p)->next) { slot_p = &(*slot_p)->next) {
assert(*slot_p != nullptr); assert(*slot_p != nullptr);