686f7cce83
FreeRTOS handles were stored plainly and they were deleted in the destructor of classes. This meant that if a class were to be copied, the destructor would be called twice on the same handles and lead to double-free. Seha on Discord suggested to fix this by using `std::unique_ptr` with a custom deletion function. The changes affect: - Thread - Semaphore - Mutex - StreamBuffer - Timer - MessageQueue - EventFlag Thread changes: - Removal of the hack with the `Data` struct - Thread's main body is now just a private static function inside the class. - The C functions were relocated to static class members PubSub changes: - Refactored pubsub into class - Renamed files to `PubSub` instead of `Pubsub` - `PubSubSubscription` is now a private inner struct and `PubSub` only exposes `SubscriptionHandle` Lockable, ScopedLockable, Mutex: - Added `lock()` method that locks indefinitely - Remove deprecated `acquire()` and `release()` methods - Removed `TtWaitForever` in favour of `portMAX_DELAY`
88 lines
2.1 KiB
C++
88 lines
2.1 KiB
C++
/**
|
|
* @file MessageQueue.h
|
|
*
|
|
* MessageQueue is a wrapper for FreeRTOS xQueue functionality.
|
|
* There is no additional thread-safety on top of the xQueue functionality,
|
|
* so make sure you create a lock if needed.
|
|
*/
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
|
|
#ifdef ESP_PLATFORM
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/queue.h"
|
|
#else
|
|
#include "FreeRTOS.h"
|
|
#include "queue.h"
|
|
#endif
|
|
|
|
namespace tt {
|
|
|
|
/**
|
|
* Message Queue implementation.
|
|
* Calls can be done from ISR/IRQ mode unless otherwise specified.
|
|
*/
|
|
class MessageQueue {
|
|
private:
|
|
|
|
struct QueueHandleDeleter {
|
|
void operator()(QueueHandle_t handleToDelete) {
|
|
vQueueDelete(handleToDelete);
|
|
}
|
|
};
|
|
|
|
std::unique_ptr<std::remove_pointer_t<QueueHandle_t>, QueueHandleDeleter> handle;
|
|
|
|
public:
|
|
/** Allocate message queue
|
|
* @param[in] capacity Maximum messages in queue
|
|
* @param[in] messageSize The size in bytes of a single message
|
|
*/
|
|
MessageQueue(uint32_t capacity, uint32_t messageSize);
|
|
|
|
~MessageQueue();
|
|
|
|
/** Post a message to the queue.
|
|
* The message is queued by copy, not by reference.
|
|
* @param[in] message A pointer to a message. The message will be copied into a buffer.
|
|
* @param[in] timeout
|
|
* @return success result
|
|
*/
|
|
bool put(const void* message, TickType_t timeout);
|
|
|
|
/** Get message from queue
|
|
* @param[out] message A pointer to an already allocated message object
|
|
* @param[in] timeout
|
|
* @return success result
|
|
*/
|
|
bool get(void* message, TickType_t timeout);
|
|
|
|
/**
|
|
* @return The maximum amount of messages that can be in the queue at any given time.
|
|
*/
|
|
uint32_t getCapacity() const;
|
|
|
|
/**
|
|
* @return The size of a single message in bytes
|
|
*/
|
|
uint32_t getMessageSize() const;
|
|
|
|
/**
|
|
* @return How many messages are currently in the queue.
|
|
*/
|
|
uint32_t getCount() const;
|
|
|
|
/**
|
|
* @return How many messages can be added to the queue before the put() method starts blocking.
|
|
*/
|
|
uint32_t getSpace() const;
|
|
|
|
/** Reset queue (cannot be called in ISR/IRQ mode)
|
|
* @return success result
|
|
*/
|
|
bool reset();
|
|
};
|
|
|
|
} // namespace
|