- Refactor `AppManifest`: add new fields and rename existing ones - Parse and validate the manifest from an app that is being installed. - Remove deprecated `scoped()` from `Lock` - Create `Tactility/Paths.h` - App loading at boot now properly parses the manifest files of external apps - Properly lock both source and destination locations during app install - Remove LVGL path variants from `AppPaths` and `ServicePaths` - Removed `xPath` base classes for apps and services. There's now `AppPaths` and `ServicePaths`. - Renamed app and service paths: "data" and "system" paths are now "user data" and "assets"
80 lines
1.9 KiB
C++
80 lines
1.9 KiB
C++
#pragma once
|
|
|
|
#include "Check.h"
|
|
#include "RtosCompat.h"
|
|
#include <memory>
|
|
#include <functional>
|
|
#include <algorithm>
|
|
|
|
namespace tt {
|
|
|
|
class ScopedLock;
|
|
|
|
/** Represents a lock/mutex */
|
|
class Lock {
|
|
|
|
public:
|
|
|
|
virtual ~Lock() = default;
|
|
|
|
virtual bool lock(TickType_t timeout) const = 0;
|
|
|
|
bool lock() const { return lock(portMAX_DELAY); }
|
|
|
|
virtual bool unlock() const = 0;
|
|
|
|
void withLock(TickType_t timeout, const std::function<void()>& onLockAcquired) const {
|
|
if (lock(timeout)) {
|
|
onLockAcquired();
|
|
unlock();
|
|
}
|
|
}
|
|
|
|
void withLock(TickType_t timeout, const std::function<void()>& onLockAcquired, const std::function<void()>& onLockFailure) const {
|
|
if (lock(timeout)) {
|
|
onLockAcquired();
|
|
unlock();
|
|
} else {
|
|
onLockFailure();
|
|
}
|
|
}
|
|
|
|
void withLock(const std::function<void()>& onLockAcquired) const { withLock(portMAX_DELAY, onLockAcquired); }
|
|
|
|
void withLock(const std::function<void()>& onLockAcquired, const std::function<void()>& onLockFailed) const { withLock(portMAX_DELAY, onLockAcquired, onLockFailed); }
|
|
|
|
ScopedLock asScopedLock() const;
|
|
};
|
|
|
|
/**
|
|
* Represents a lockable instance that is scoped to a specific lifecycle.
|
|
* Once the ScopedLock is destroyed, unlock() is called automatically.
|
|
*
|
|
* In other words:
|
|
* You have to lock() this object manually, but unlock() happens automatically on destruction.
|
|
*/
|
|
class ScopedLock final : public Lock {
|
|
|
|
const Lock& lockable;
|
|
|
|
public:
|
|
|
|
using Lock::lock;
|
|
|
|
explicit ScopedLock(const Lock& lockable) : lockable(lockable) {}
|
|
|
|
~ScopedLock() override {
|
|
lockable.unlock(); // We don't care whether it succeeded or not
|
|
}
|
|
|
|
bool lock(TickType_t timeout) const override {
|
|
return lockable.lock(timeout);
|
|
}
|
|
|
|
bool unlock() const override {
|
|
return lockable.unlock();
|
|
}
|
|
};
|
|
|
|
}
|