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

preen

Browse Source
This commit is contained in:
J. Nick Koston 2025-07-10 22:11:26 -10:00
parent 3570b888d2
commit 00e39958b8
No known key found for this signature in database
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,11 +355,14 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
decoded = decode_varint_field(field->get_type(), field_addr, value);
}
// If not found, try repeated fields
// If not found, try repeated fields (linear search - usually only 1-2 fields)
if (!decoded) {
if (const RepeatedFieldMeta *field = find_field_binary(repeated_fields, repeated_count, field_id, 0)) {
void *field_addr = base + field->get_offset();
decoded = decode_repeated_varint_field(field->get_type(), field_addr, value);
for (uint8_t j = 0; j < repeated_count; j++) {
if (repeated_fields[j].field_num == field_id && repeated_fields[j].get_wire_type() == 0) {
void *field_addr = base + repeated_fields[j].get_offset();
decoded = decode_repeated_varint_field(repeated_fields[j].get_type(), field_addr, value);
break;
}
}
}
@ -389,11 +392,15 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
decoded = decode_length_field(field->get_type(), field_addr, value, field->get_message_type_id());
}
// If not found, try repeated fields
// If not found, try repeated fields (linear search - usually only 1-2 fields)
if (!decoded) {
if (const RepeatedFieldMeta *field = find_field_binary(repeated_fields, repeated_count, field_id, 2)) {
void *field_addr = base + field->get_offset();
decoded = decode_repeated_length_field(field->get_type(), field_addr, value, field->get_message_type_id());
for (uint8_t j = 0; j < repeated_count; j++) {
if (repeated_fields[j].field_num == field_id && repeated_fields[j].get_wire_type() == 2) {
void *field_addr = base + repeated_fields[j].get_offset();
decoded = decode_repeated_length_field(repeated_fields[j].get_type(), field_addr, value,
repeated_fields[j].get_message_type_id());
break;
}
}
}
@ -420,11 +427,14 @@ void ProtoMessage::decode(const uint8_t *buffer, size_t length) {
decoded = decode_32bit_field(field->get_type(), field_addr, value);
}
// If not found, try repeated fields
// If not found, try repeated fields (linear search - usually only 1-2 fields)
if (!decoded) {
if (const RepeatedFieldMeta *field = find_field_binary(repeated_fields, repeated_count, field_id, 5)) {
void *field_addr = base + field->get_offset();
decoded = decode_repeated_32bit_field(field->get_type(), field_addr, value);
for (uint8_t j = 0; j < repeated_count; j++) {
if (repeated_fields[j].field_num == field_id && repeated_fields[j].get_wire_type() == 5) {
void *field_addr = base + repeated_fields[j].get_offset();
decoded = decode_repeated_32bit_field(repeated_fields[j].get_type(), field_addr, value);
break;
}
}
}

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

@ -327,8 +327,7 @@ struct RepeatedFieldMeta {
};
// Binary search for field lookup - optimized for performance
template<typename MetaType>
inline const MetaType *find_field_binary(const MetaType *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 wire_type) {
uint8_t left = 0;
uint8_t right = count;

2
script/api_protobuf/api_protobuf.py
View File

@ -1893,7 +1893,7 @@ namespace api {
cpp += "};\n"
if repeated_fields:
# Sort fields by field number for binary search
# Sort fields by field number for consistency (even though using linear search)
sorted_fields = sorted(
repeated_fields, key=lambda f: int(f.split(",")[0].strip("{"))
)