github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-17 01:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bloat

Browse Source
This commit is contained in:
J. Nick Koston
2026-04-03 22:46:36 -10:00
parent dee78b8a8e
commit 599f784a90
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/api/api_connection.cpp
+6
View File
@@ -1997,6 +1997,12 @@ bool APIConnection::send_message_(uint32_t payload_size, uint8_t message_type, M
return this->send_buffer(ProtoWriteBuffer{&shared_buf}, message_type);
}
// encode_to_buffer is defined inline in api_connection.h (ESPHOME_ALWAYS_INLINE)
// Noinline wrapper for zero-payload messages — single shared copy instead of
// duplicating encode_to_buffer at each cold call site.
uint16_t APIConnection::encode_empty_to_buffer(const void *msg, APIConnection *conn, uint32_t remaining_size) {
return encode_to_buffer(0, &encode_msg_noop, msg, conn, remaining_size);
}
bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) {
const bool is_log_message = (message_type == SubscribeLogsResponse::MESSAGE_TYPE);
esphome/components/api/api_connection.h
+7 -4
View File
@@ -403,9 +403,8 @@ class APIConnection final : public APIServerConnectionBase {
bool send_message_(uint32_t payload_size, uint8_t message_type, MessageEncodeFn encode_fn, const void *msg);
// Non-template buffer management for batch encoding.
// ALWAYS_INLINE so it merges into each call site (encode_message_to_buffer,
// fill_and_encode_entity_state) — the compiler can then inline the encode_fn
// callback and eliminate the indirect call.
// ALWAYS_INLINE so it merges into each call site — the compiler can then
// inline the encode_fn callback and eliminate the indirect call.
static inline uint16_t ESPHOME_ALWAYS_INLINE encode_to_buffer(uint32_t calculated_size, MessageEncodeFn encode_fn,
const void *msg, APIConnection *conn,
uint32_t remaining_size) {
@@ -450,10 +449,14 @@ class APIConnection final : public APIServerConnectionBase {
return static_cast<uint16_t>(total_calculated_size);
}
// Noinline path for zero-payload messages (ping, disconnect, list_info_done).
// Avoids duplicating encode_to_buffer at each cold call site.
static uint16_t encode_empty_to_buffer(const void *msg, APIConnection *conn, uint32_t remaining_size);
// Thin template wrapper — computes size, delegates buffer work to non-template helper
template<typename T> static uint16_t encode_message_to_buffer(T &msg, APIConnection *conn, uint32_t remaining_size) {
if constexpr (T::ESTIMATED_SIZE == 0) {
return encode_to_buffer(0, &encode_msg_noop, &msg, conn, remaining_size);
return encode_empty_to_buffer(&msg, conn, remaining_size);
} else {
return encode_to_buffer(msg.calculate_size(), &proto_encode_msg<T>, &msg, conn, remaining_size);
}