mirror of
https://github.com/meshtastic/firmware.git
synced 2026-10-09 14:41:19 -04:00
* logging: strip redundant punctuation, level prefixes, and 'successfully' from log strings The logger already appends a newline and prints the level tag, so trailing '.', '!', '...', literal \n, and 'Error:'/'Warning:' prefixes inside format strings are wasted flash bytes. Same for 'successfully' (the affirmative form already implies it). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LBiZc9sfPrH1MZ2L3Fxgt1 * logging: tighten verbose log strings in modules, radio, platform, and system code Rewrite wordy log messages to terser equivalents - drop filler words (articles, 'attempting', 'due to', 'please'), use 'Can't X'/'X failed' phrasing, and abbreviate where the codebase already does (config, init, msg, BT). Format specifiers and argument lists are unchanged; distinctive greppable tokens are preserved. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LBiZc9sfPrH1MZ2L3Fxgt1 * logging: tighten verbose log strings in telemetry sensors and GPS Same terseness pass: drop filler, 'Can't X'/'X failed' phrasing, common abbreviations (temp, msg). Specifiers, arguments, and sensor-name prefixes unchanged. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LBiZc9sfPrH1MZ2L3Fxgt1 * logging: tighten verbose log strings in mesh core Same terseness pass over NodeDB, Router, MeshService, PhoneAPI, RadioInterface, NextHopRouter, and PacketHistory: 'X failed'/'Can't X' phrasing, imperative verbs, dropped filler. Specifiers and arguments unchanged; duplicate literals kept identical to preserve linker string dedup. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LBiZc9sfPrH1MZ2L3Fxgt1 * logging: 'Unable to/Could not/Cannot' -> "Can't" in log strings Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LBiZc9sfPrH1MZ2L3Fxgt1 * logging: clang-format rewrap after string shortening Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LBiZc9sfPrH1MZ2L3Fxgt1 * logging: restore boot-logo trailing newline and progress-dot strings The terseness pass over-trimmed: the Meshtastic ASCII boot logo kept its blank line via a trailing \n, and three bare "." progress ticks were reduced to empty strings. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LBiZc9sfPrH1MZ2L3Fxgt1 * Update src/mesh/wifi/WiFiAPClient.cpp Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * logging: address review feedback on the terseness audit - Node/packet IDs use the repo's 0x%08x convention in NextHopRouter, NodeDB, AdminModule and CannedMessageModule. The sibling log in each if/else pair is converted too, so a pair isn't split across two formats. next_hop stays 0x%x - it's the last-byte relay hint, not a NodeNum. - RTC: the read-path and set-path "not found" warnings were byte-identical, so the linker deduped them and the log couldn't say which one fired. Split into "RTC read:" / "RTC set:". (The four sites live in mutually exclusive #ifdef branches, so the RTC family was never ambiguous.) - SCD4X getAmbientPressure()/setAmbientPressure() logged "altitude", and SCD30 getASC() logged "Can't send command" for a read. Both now name the operation they actually perform. - LOG_ERROR already carries the level: ". Error: %u" -> ", rc=%u" (matching the existing rc=%d house style) and "Error executing X()" -> "X() failed". - Typos and wording: "OTA partiton. (Reason" -> "OTA partition (reason", "CST3530 not response ~" -> "CST3530 no response", "Packet received with to: of 0" -> "to=0", HostMetrics "Error decoding" -> "Can't decode", and the dangling ": " on the NextHopRouter retransmission line. Printf specifier sequences are byte-identical on all 37 touched lines apart from the 6 deliberate %x/%u -> %08x node-ID widenings, all on uint32_t args. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
182 lines
5.6 KiB
C++
182 lines
5.6 KiB
C++
#pragma once
|
|
|
|
#include <Arduino.h>
|
|
#include <assert.h>
|
|
#include <functional>
|
|
#include <memory>
|
|
|
|
#include "PointerQueue.h"
|
|
#include "configuration.h" // For LOG_WARN, LOG_DEBUG, LOG_HEAP
|
|
#include "memory/MemAudit.h"
|
|
|
|
template <class T> class Allocator
|
|
{
|
|
|
|
public:
|
|
/// Optional memaudit tag: when set, live objects from this allocator are
|
|
/// reported under it (+/- sizeof(T) per alloc/release).
|
|
explicit Allocator(const char *auditTag = nullptr) : deleter([this](T *p) { this->release(p); }), auditTag(auditTag) {}
|
|
virtual ~Allocator() {}
|
|
|
|
/// Return a queable object which has been prefilled with zeros. Return nullptr if no buffer is available
|
|
/// Note: this method is safe to call from regular OR ISR code
|
|
T *allocZeroed()
|
|
{
|
|
T *p = allocZeroed(0);
|
|
if (!p) {
|
|
LOG_WARN("Failed to allocate zeroed memory");
|
|
}
|
|
return p;
|
|
}
|
|
|
|
/// Return a queable object which has been prefilled with zeros - allow timeout to wait for available buffers (you probably
|
|
/// don't want this version).
|
|
T *allocZeroed(TickType_t maxWait)
|
|
{
|
|
T *p = alloc(maxWait);
|
|
|
|
if (p)
|
|
memset(p, 0, sizeof(T));
|
|
return p;
|
|
}
|
|
|
|
/// Return a queable object which is a copy of some other object
|
|
T *allocCopy(const T &src, TickType_t maxWait = portMAX_DELAY)
|
|
{
|
|
T *p = alloc(maxWait);
|
|
if (!p) {
|
|
LOG_WARN("Failed to allocate memory for copy");
|
|
return nullptr;
|
|
}
|
|
|
|
*p = src;
|
|
return p;
|
|
}
|
|
|
|
/// Variations of the above methods that return std::unique_ptr instead of raw pointers.
|
|
using UniqueAllocation = std::unique_ptr<T, const std::function<void(T *)> &>;
|
|
/// Return a queable object which has been prefilled with zeros.
|
|
/// std::unique_ptr wrapped variant of allocZeroed().
|
|
UniqueAllocation allocUniqueZeroed() { return UniqueAllocation(allocZeroed(), deleter); }
|
|
/// Return a queable object which has been prefilled with zeros - allow timeout to wait for available buffers (you probably
|
|
/// don't want this version).
|
|
/// std::unique_ptr wrapped variant of allocZeroed(TickType_t maxWait).
|
|
UniqueAllocation allocUniqueZeroed(TickType_t maxWait) { return UniqueAllocation(allocZeroed(maxWait), deleter); }
|
|
/// Return a queable object which is a copy of some other object
|
|
/// std::unique_ptr wrapped variant of allocCopy(const T &src, TickType_t maxWait).
|
|
UniqueAllocation allocUniqueCopy(const T &src, TickType_t maxWait = portMAX_DELAY)
|
|
{
|
|
return UniqueAllocation(allocCopy(src, maxWait), deleter);
|
|
}
|
|
|
|
/// Return a buffer for use by others
|
|
virtual void release(T *p) = 0;
|
|
|
|
protected:
|
|
// Alloc some storage
|
|
virtual T *alloc(TickType_t maxWait) = 0;
|
|
|
|
// Report a live-object delta to memaudit (no-op when untagged)
|
|
void auditAdd(int32_t delta)
|
|
{
|
|
if (auditTag)
|
|
memaudit::add(auditTag, delta);
|
|
}
|
|
|
|
private:
|
|
// std::unique_ptr Deleter function; calls release().
|
|
const std::function<void(T *)> deleter;
|
|
const char *auditTag; // memaudit tag, or nullptr for untracked pools
|
|
};
|
|
|
|
/**
|
|
* An allocator that just uses regular free/malloc
|
|
*/
|
|
template <class T> class MemoryDynamic : public Allocator<T>
|
|
{
|
|
public:
|
|
explicit MemoryDynamic(const char *auditTag = nullptr) : Allocator<T>(auditTag) {}
|
|
|
|
/// Return a buffer for use by others
|
|
virtual void release(T *p) override
|
|
{
|
|
if (p == nullptr)
|
|
return;
|
|
|
|
LOG_HEAP("Freeing 0x%x", p);
|
|
|
|
this->auditAdd(-(int32_t)sizeof(T));
|
|
free(p);
|
|
}
|
|
|
|
protected:
|
|
// Alloc some storage
|
|
virtual T *alloc(TickType_t maxWait) override
|
|
{
|
|
T *p = (T *)malloc(sizeof(T));
|
|
if (!p) {
|
|
LOG_WARN("malloc(%u) failed, heap exhausted", (unsigned)sizeof(T));
|
|
return nullptr;
|
|
}
|
|
this->auditAdd((int32_t)sizeof(T));
|
|
return p;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* A static memory pool that uses a fixed buffer instead of heap allocation
|
|
*/
|
|
template <class T, int MaxSize> class MemoryPool : public Allocator<T>
|
|
{
|
|
private:
|
|
T pool[MaxSize];
|
|
bool used[MaxSize];
|
|
|
|
public:
|
|
explicit MemoryPool(const char *auditTag = nullptr) : Allocator<T>(auditTag), pool{}, used{}
|
|
{
|
|
// Arrays are now zero-initialized by member initializer list
|
|
// pool array: all elements are default-constructed (zero for POD types)
|
|
// used array: all elements are false (zero-initialized)
|
|
}
|
|
|
|
/// Return a buffer for use by others
|
|
virtual void release(T *p) override
|
|
{
|
|
if (!p) {
|
|
LOG_DEBUG("Failed to release memory, pointer is null");
|
|
return;
|
|
}
|
|
|
|
// Find the index of this pointer in our pool
|
|
int index = p - pool;
|
|
if (index >= 0 && index < MaxSize) {
|
|
assert(used[index]); // Should be marked as used
|
|
used[index] = false;
|
|
this->auditAdd(-(int32_t)sizeof(T));
|
|
LOG_HEAP("Released static pool item %d at 0x%x", index, p);
|
|
} else {
|
|
LOG_WARN("Pointer 0x%x not from our pool", p);
|
|
}
|
|
}
|
|
|
|
protected:
|
|
// Alloc some storage from our static pool
|
|
virtual T *alloc(TickType_t maxWait) override
|
|
{
|
|
// Find first free slot
|
|
for (int i = 0; i < MaxSize; i++) {
|
|
if (!used[i]) {
|
|
used[i] = true;
|
|
this->auditAdd((int32_t)sizeof(T));
|
|
LOG_HEAP("Allocated static pool item %d at 0x%x", i, &pool[i]);
|
|
return &pool[i];
|
|
}
|
|
}
|
|
|
|
// No free slots available - return nullptr instead of asserting
|
|
LOG_WARN("No free slots available in static memory pool");
|
|
return nullptr;
|
|
}
|
|
};
|