jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-05 09:57:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-11 06:05:26 -10:00
parent 037eff53b1
commit c2657c1896
No known key found for this signature in database
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/components/api/proto.cpp
View File

@ -350,7 +350,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
ProtoVarInt value = *value_res; ProtoVarInt value = *value_res;
// Try regular fields first using binary search // Try regular fields first using binary search
if (const FieldMeta *field = find_field_binary(fields, field_count, field_id, 0)) { if (const FieldMeta *field = find_field_binary(fields, field_count, field_id)) {
void *field_addr = base + field->get_offset(); void *field_addr = base + field->get_offset();
decoded = decode_varint_field(field->get_type(), field_addr, value); decoded = decode_varint_field(field->get_type(), field_addr, value);
} }
@ -387,7 +387,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
ProtoLengthDelimited value(&buffer[i], field_length); ProtoLengthDelimited value(&buffer[i], field_length);
// Try regular fields first using binary search // Try regular fields first using binary search
if (const FieldMeta *field = find_field_binary(fields, field_count, field_id, 2)) { if (const FieldMeta *field = find_field_binary(fields, field_count, field_id)) {
void *field_addr = base + field->get_offset(); void *field_addr = base + field->get_offset();
decoded = decode_length_field(field->get_type(), field_addr, value, field->get_message_type_id()); decoded = decode_length_field(field->get_type(), field_addr, value, field->get_message_type_id());
} }
@ -422,7 +422,7 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
Proto32Bit value(raw); Proto32Bit value(raw);
// Try regular fields first using binary search // Try regular fields first using binary search
if (const FieldMeta *field = find_field_binary(fields, field_count, field_id, 5)) { if (const FieldMeta *field = find_field_binary(fields, field_count, field_id)) {
void *field_addr = base + field->get_offset(); void *field_addr = base + field->get_offset();
decoded = decode_32bit_field(field->get_type(), field_addr, value); decoded = decode_32bit_field(field->get_type(), field_addr, value);
} }

26
esphome/components/api/proto.h
View File

@ -309,7 +309,7 @@ struct RepeatedFieldMeta {
}; };
// Binary search for field lookup - optimized for performance // Binary search for field lookup - optimized for performance
inline const FieldMeta *find_field_binary(const FieldMeta *fields, uint8_t count, uint8_t field_id, uint8_t wire_type) { inline const FieldMeta *find_field_binary(const FieldMeta *fields, uint8_t count, uint8_t field_id) {
uint8_t left = 0; uint8_t left = 0;
uint8_t right = count; uint8_t right = count;
@ -322,28 +322,8 @@ inline const FieldMeta *find_field_binary(const FieldMeta *fields, uint8_t count
} else if (mid_field > field_id) { } else if (mid_field > field_id) {
right = mid; right = mid;
} else { } else {
// Found field_id, check wire type // Found field_id
if (get_wire_type(fields[mid].get_type()) == wire_type) { return &fields[mid];
return &fields[mid];
}
// Field number matches but wire type doesn't - search nearby entries
// (in case there are multiple fields with same number but different types)
// Search backwards
for (uint8_t k = mid; k > 0 && fields[k - 1].field_num == field_id; k--) {
if (get_wire_type(fields[k - 1].get_type()) == wire_type) {
return &fields[k - 1];
}
}
// Search forwards
for (uint8_t k = mid + 1; k < count && fields[k].field_num == field_id; k++) {
if (get_wire_type(fields[k].get_type()) == wire_type) {
return &fields[k];
}
}
return nullptr; // Field number found but no matching wire type
} }
} }