mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-29 16:03:14 +03:00
- Rework ExpiringTimeTracker to be based on PolledTimeout.
- Ensure espnowDelay and floodingMeshDelay always performs maintenance. - Rework MutexTracker to use shared_ptr. - Change enums to enum class. - Change typedef to using. - Add HeapMonitor class. - Make _messageIDs be a map instead of an unordered_map to reduce heap usage. - Use the possibly broken wifi_country ESP8266 API to check for legal WiFi channels when setting WiFi channels. - Make MessageData, RequestData and ResponseData contain a TimeTracker rather than inherit from TimeTracker. - Add deprecated attribute to TransmissionResult. - Remove superfluous elses. - Reduce cyclomatic complexity. - Change postfix ++ and -- to prefix. - Generalize getEncryptedConnectionIterator method. - Increase code NRVO compatibility. - Change _connectionAttemptTimeoutMs type from int32_t to uint32_t. - Add deprecated attribute to ESP8266WiFiMesh. - Add some constness to TypeConversionFunctions. - Move base36 arrays to PROGMEM in TypeConversionFunctions.cpp. - Add deprecated atttribute to SHA1 and MD5 hashes. - Remove _warningsEnabled in CryptoInterface since this has been replaced by the deprecated attribute. - Prefix all TypeConversion getters with "get". - Improve comments. - Fix merge conflict.
This commit is contained in:
@ -24,19 +24,19 @@
|
||||
|
||||
#include "MutexTracker.h"
|
||||
|
||||
bool MutexTracker::_captureBan = false;
|
||||
std::shared_ptr<bool> MutexTracker::_captureBan = std::make_shared<bool>(false);
|
||||
|
||||
bool &MutexTracker::captureBan()
|
||||
std::shared_ptr<bool> MutexTracker::captureBan()
|
||||
{
|
||||
return _captureBan;
|
||||
}
|
||||
|
||||
MutexTracker::MutexTracker(bool &mutexToCapture)
|
||||
MutexTracker::MutexTracker(const std::shared_ptr<bool> &mutexToCapture)
|
||||
{
|
||||
attemptMutexCapture(mutexToCapture);
|
||||
}
|
||||
|
||||
MutexTracker::MutexTracker(bool &mutexToCapture, std::function<void()> destructorHook) : MutexTracker(mutexToCapture)
|
||||
MutexTracker::MutexTracker(const std::shared_ptr<bool> &mutexToCapture, const std::function<void()> destructorHook) : MutexTracker(mutexToCapture)
|
||||
{
|
||||
_destructorHook = destructorHook;
|
||||
}
|
||||
@ -47,12 +47,25 @@ MutexTracker::~MutexTracker()
|
||||
_destructorHook();
|
||||
}
|
||||
|
||||
bool MutexTracker::mutexCaptured()
|
||||
bool MutexTracker::mutexFree(const std::shared_ptr<bool> &mutex)
|
||||
{
|
||||
if(_capturedMutex)
|
||||
if(mutex != nullptr && !(*mutex))
|
||||
return true;
|
||||
else
|
||||
return false;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool MutexTracker::mutexCaptured(const std::shared_ptr<bool> &mutex)
|
||||
{
|
||||
if(mutex != nullptr && (*mutex))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool MutexTracker::mutexCaptured() const
|
||||
{
|
||||
return mutexCaptured(_capturedMutex);
|
||||
}
|
||||
|
||||
void MutexTracker::releaseMutex()
|
||||
@ -60,20 +73,18 @@ void MutexTracker::releaseMutex()
|
||||
if(mutexCaptured())
|
||||
{
|
||||
*_capturedMutex = false;
|
||||
_capturedMutex = nullptr;
|
||||
_capturedMutex.reset();
|
||||
}
|
||||
}
|
||||
|
||||
bool MutexTracker::attemptMutexCapture(bool &mutexToCapture)
|
||||
bool MutexTracker::attemptMutexCapture(const std::shared_ptr<bool> &mutexToCapture)
|
||||
{
|
||||
if(!captureBan() && !mutexToCapture)
|
||||
if(mutexFree(captureBan()) && mutexFree(mutexToCapture))
|
||||
{
|
||||
_capturedMutex = &mutexToCapture;
|
||||
_capturedMutex = mutexToCapture;
|
||||
*_capturedMutex = true;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user