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`
75 lines
1.4 KiB
C++
75 lines
1.4 KiB
C++
#pragma once
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include <dirent.h>
|
|
#include "Mutex.h"
|
|
|
|
namespace tt::app::files {
|
|
|
|
class State {
|
|
|
|
public:
|
|
|
|
enum PendingAction {
|
|
ActionNone,
|
|
ActionDelete,
|
|
ActionRename
|
|
};
|
|
|
|
private:
|
|
|
|
Mutex mutex = Mutex(Mutex::Type::Recursive);
|
|
std::vector<dirent> dir_entries;
|
|
std::string current_path;
|
|
std::string selected_child_entry;
|
|
PendingAction action = ActionNone;
|
|
|
|
public:
|
|
|
|
|
|
State();
|
|
|
|
void freeEntries() {
|
|
dir_entries.clear();
|
|
}
|
|
|
|
~State() {
|
|
freeEntries();
|
|
}
|
|
|
|
bool setEntriesForChildPath(const std::string& child_path);
|
|
bool setEntriesForPath(const std::string& path);
|
|
|
|
const std::vector<dirent>& lockEntries() const {
|
|
mutex.lock();
|
|
return dir_entries;
|
|
}
|
|
|
|
void unlockEntries() {
|
|
mutex.unlock();
|
|
}
|
|
|
|
bool getDirent(uint32_t index, dirent& dirent);
|
|
|
|
void setSelectedChildEntry(const std::string& newFile) {
|
|
selected_child_entry = newFile;
|
|
action = ActionNone;
|
|
}
|
|
|
|
std::string getSelectedChildEntry() const { return selected_child_entry; }
|
|
std::string getCurrentPath() const { return current_path; }
|
|
|
|
std::string getSelectedChildPath() const;
|
|
|
|
PendingAction getPendingAction() const {
|
|
return action;
|
|
}
|
|
|
|
void setPendingAction(PendingAction newAction) {
|
|
action = newAction;
|
|
}
|
|
};
|
|
|
|
}
|