Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/mesh/MeshService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,14 @@ void MeshService::handleToRadio(meshtastic_MeshPacket &p)
// (so we update our nodedb for the local node)

// Send the packet into the mesh
#if defined(DEBUG_HEAP)
auto heapBefore = memGet.getFreeHeap();
#endif
auto a = packetPool.allocCopy(p);
#if defined(DEBUG_HEAP)
auto heapAfter = memGet.getFreeHeap();
LOG_HEAP("Alloc in MeshService::handleToRadio() pointer 0x%x, size: %u, free: %u", a, heapBefore - heapAfter, heapAfter);

#endif
sendToMesh(a, RX_SRC_USER);

bool loopback = false; // if true send any packet the phone sends back itself (for testing)
Expand Down Expand Up @@ -254,10 +257,14 @@ void MeshService::sendToMesh(meshtastic_MeshPacket *p, RxSource src, bool ccToPh
}

if ((res == ERRNO_OK || res == ERRNO_SHOULD_RELEASE) && ccToPhone) { // Check if p is not released in case it couldn't be sent
#if defined(DEBUG_HEAP)
auto heapBefore = memGet.getFreeHeap();
#endif
auto a = packetPool.allocCopy(*p);
#if defined(DEBUG_HEAP)
auto heapAfter = memGet.getFreeHeap();
LOG_HEAP("Alloc in MeshService::sendToMesh() pointer 0x%x, size: %u, free: %u", a, heapBefore - heapAfter, heapAfter);
#endif

sendToPhone(a);
}
Expand Down
4 changes: 4 additions & 0 deletions src/mesh/ReliableRouter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ ErrorCode ReliableRouter::send(meshtastic_MeshPacket *p)
if (p->hop_limit == 0) {
p->hop_limit = Default::getConfiguredOrDefaultHopLimit(config.lora.hop_limit);
}
#if defined(DEBUG_HEAP)
auto heapBefore = memGet.getFreeHeap();
#endif
auto copy = packetPool.allocCopy(*p);
#if defined(DEBUG_HEAP)
auto heapAfter = memGet.getFreeHeap();
LOG_HEAP("Alloc in ReliableRouter::send() pointer 0x%x, size: %u, free: %u", copy, heapBefore - heapAfter, heapAfter);
#endif

startRetransmission(copy, NUM_RELIABLE_RETX);
}
Expand Down
10 changes: 9 additions & 1 deletion src/mesh/Router.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,14 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it

#if defined(DEBUG_HEAP)
auto heapBefore = memGet.getFreeHeap();
#endif
meshtastic_MeshPacket *p_decoded = packetPool.allocCopy(*p);
#if defined(DEBUG_HEAP)
auto heapAfter = memGet.getFreeHeap();

LOG_HEAP("Alloc in Router::send pointer 0x%x, size: %u, free: %u", p_decoded, heapBefore - heapAfter, heapAfter);
#endif

auto encodeResult = perhapsEncode(p);
if (encodeResult != meshtastic_Routing_Error_NONE) {
Expand Down Expand Up @@ -612,11 +615,16 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
bool skipHandle = false;
// Also, we should set the time from the ISR and it should have msec level resolution
p->rx_time = getValidTime(RTCQualityFromNet); // store the arrival timestamp for the phone

// Store a copy of encrypted packet for MQTT
#if defined(DEBUG_HEAP)
auto heapBefore = memGet.getFreeHeap();
#endif
meshtastic_MeshPacket *p_encrypted = packetPool.allocCopy(*p);
#if defined(DEBUG_HEAP)
auto heapAfter = memGet.getFreeHeap();
LOG_HEAP("Alloc in Router::handleReceived pointer 0x%x, size: %u, free: %u", p_encrypted, heapBefore - heapAfter, heapAfter);
#endif

// Take those raw bytes and convert them back into a well structured protobuf we can understand
auto decodedState = perhapsDecode(p);
Expand Down
6 changes: 5 additions & 1 deletion src/modules/NodeInfoModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,15 @@ void NodeInfoModule::sendOurNodeInfo(NodeNum dest, bool wantReplies, uint8_t cha
if (prevPacketId) // if we wrap around to zero, we'll simply fail to cancel in that rare case (no big deal)
service->cancelSending(prevPacketId);
shorterTimeout = _shorterTimeout;
#if defined(DEBUG_HEAP)
auto heapBefore = memGet.getFreeHeap();
#endif
meshtastic_MeshPacket *p = allocReply();
#if defined(DEBUG_HEAP)
auto heapAfter = memGet.getFreeHeap();

LOG_HEAP("Alloc in NodeInfoModule::sendOurNodeInfo pointer 0x%x, size: %u, free: %u", p, heapBefore - heapAfter, heapAfter);
#endif

if (p) { // Check whether we didn't ignore it
p->to = dest;
p->decoded.want_response = (config.device.role != meshtastic_Config_DeviceConfig_Role_TRACKER &&
Expand Down
4 changes: 4 additions & 0 deletions src/modules/Telemetry/DeviceTelemetry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,15 @@ bool DeviceTelemetryModule::sendTelemetry(NodeNum dest, bool phoneOnly)
telemetry.variant.device_metrics.battery_level, telemetry.variant.device_metrics.voltage,
telemetry.variant.device_metrics.uptime_seconds);

#if defined(DEBUG_HEAP)
auto heapBefore = memGet.getFreeHeap();
#endif
meshtastic_MeshPacket *p = allocDataProtobuf(telemetry);
#if defined(DEBUG_HEAP)
auto heapAfter = memGet.getFreeHeap();
LOG_HEAP("Alloc in DeviceTelemetryModule::sendTelemetry() pointer 0x%x, size: %u, free: %u", p, heapBefore - heapAfter,
heapAfter);
#endif

p->to = dest;
p->decoded.want_response = false;
Expand Down