bneradt commented on code in PR #13455:
URL: https://github.com/apache/trafficserver/pull/13455#discussion_r3754773324
##########
src/proxy/hdrs/MIME.cc:
##########
@@ -1338,21 +1359,63 @@ mime_field_init(MIMEField *field)
field->m_wks_idx = -1;
}
+static void
+mime_hdr_rebuild_field_free_list(MIMEHdrImpl *mh)
+{
+ MIMEField *free_field = nullptr;
+ int32_t slotnum = 0;
+
+ mh->m_free_slot = MIME_FIELD_FREE_SLOT_NONE;
+ for (MIMEFieldBlockImpl *fblock = &mh->m_first_fblock; fblock != nullptr;
fblock = fblock->m_next) {
+ for (uint32_t index = 0; index < fblock->m_freetop; ++index) {
+ MIMEField *field = &fblock->m_field_slots[index];
+
+ if (field->m_readiness == MIME_FIELD_SLOT_READINESS_DELETED ||
field->m_readiness == MIME_FIELD_SLOT_READINESS_EMPTY) {
+ field->m_readiness = MIME_FIELD_SLOT_READINESS_DELETED;
+ field->m_next_dup = free_field;
+ free_field = field;
+ mh->m_free_slot = slotnum + static_cast<int32_t>(index);
+ }
+ }
+ slotnum += MIME_FIELD_BLOCK_SLOTS;
+ }
+}
+
MIMEField *
mime_field_create(HdrHeap *heap, MIMEHdrImpl *mh)
{
MIMEField *field;
MIMEFieldBlockImpl *tail_fblock, *new_fblock;
tail_fblock = mh->m_fblock_list_tail;
- if (tail_fblock->m_freetop >= MIME_FIELD_BLOCK_SLOTS) {
- new_fblock = (MIMEFieldBlockImpl
*)heap->allocate_obj(sizeof(MIMEFieldBlockImpl), HdrHeapObjType::FIELD_BLOCK);
- _mime_hdr_field_block_init(new_fblock);
- tail_fblock->m_next = new_fblock;
- tail_fblock = new_fblock;
- mh->m_fblock_list_tail = new_fblock;
+ if (tail_fblock->m_freetop < MIME_FIELD_BLOCK_SLOTS) {
+ field = &(tail_fblock->m_field_slots[tail_fblock->m_freetop]);
+ ++tail_fblock->m_freetop;
+
+ mime_field_init(field);
+ return field;
+ }
+
+ if (mh->m_free_slot == MIME_FIELD_FREE_SLOT_UNINITIALIZED) {
+ mime_hdr_rebuild_field_free_list(mh);
}
+ if (mh->m_free_slot != MIME_FIELD_FREE_SLOT_NONE) {
+ field = mime_hdr_field_get_slotnum(mh, mh->m_free_slot);
+ ink_release_assert(field != nullptr);
+ ink_release_assert(field->m_readiness ==
MIME_FIELD_SLOT_READINESS_DELETED);
+
+ mh->m_free_slot = field->m_next_dup ? mime_hdr_field_slotnum(mh,
field->m_next_dup) : MIME_FIELD_FREE_SLOT_NONE;
Review Comment:
Agreed. Deleted fields now store the next free slot number directly,
eliminating the second field-block traversal from deletion and reuse.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
