exodus/Leo-ElixirLights
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate fully to freeRTOS

Browse Source
This commit is contained in:
Jakob Gegeniger
2025-02-15 22:21:19 +01:00
parent 4e94d7ad78
commit c13310d540
22 changed files with 226 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/spit/src/SPITSocket.cpp
+10 -11
View File
@@ -15,7 +15,7 @@
#include "SPITSocket.h"
//----- initialize static members -----
recursive_mutex SPITSocket::s_MutexIPAddresses;
fos::Mutex SPITSocket::s_MutexIPAddresses;
unordered_map<string, SPITSocket::IPAddress*> SPITSocket::s_IPAddresses;
int SPITSocket::FAMILY_IP4 = 2;
int SPITSocket::FAMILY_IP6 = 23;
@@ -34,7 +34,7 @@ SPITSocket::SPITSocket() {
SPITSocket::~SPITSocket() {
{
unique_lock<recursive_mutex> o_LockSocket(m_MutexSocket);
fos::MutexGuard o_LockSocket(m_MutexSocket);
m_IsBound = false;
}
}
@@ -71,7 +71,7 @@ void SPITSocket::setBoundClientFamily(int p_Family) {
void SPITSocket::setIsBound(bool p_IsBound) {
{
unique_lock<recursive_mutex> o_LockSocket(m_MutexSocket);
fos::MutexGuard o_LockSocket(m_MutexSocket);
m_IsBound = p_IsBound;
}
}
@@ -83,7 +83,7 @@ int SPITSocket::sendMessage(const char* p_MessageBytes, int p_MessageLength) {
if (m_ServerPort.length() <= 0) return -1;
int intResult;
{
unique_lock<recursive_mutex> o_LockSocket(m_MutexSocket);
fos::MutexGuard o_LockSocket(m_MutexSocket);
if (m_IsBound == false) return -1;
intResult = sendMessageTo(m_BoundClientFamily, m_ServerIP, m_ServerPort, p_MessageBytes, p_MessageLength);
}
@@ -96,7 +96,7 @@ int SPITSocket::sendMessage(const char* p_MessageBytes, int p_MessageLength) {
void SPITSocket::addIPAddress(string p_IPAddress, string p_SubnetMask) {
IPAddress* o_IPAddress;
{
unique_lock<recursive_mutex> o_LockIP(s_MutexIPAddresses);
fos::MutexGuard o_LockIP(s_MutexIPAddresses);
auto i = s_IPAddresses.find(p_IPAddress);
if (i != s_IPAddresses.end()) {
o_IPAddress = i->second;
@@ -113,7 +113,7 @@ void SPITSocket::addIPAddress(string p_IPAddress, string p_SubnetMask) {
void SPITSocket::removeIPAddress(string p_IPAddress) {
IPAddress* o_IPAddress;
{
unique_lock<recursive_mutex> o_LockIP(s_MutexIPAddresses);
fos::MutexGuard o_LockIP(s_MutexIPAddresses);
auto i = s_IPAddresses.find(p_IPAddress);
if (i != s_IPAddresses.end()) {
o_IPAddress = i->second;
@@ -127,9 +127,8 @@ int SPITSocket::getIPAddressCount() {
}
SPITSocket::IPAddress* SPITSocket::getIPAddress(int p_Index) {
IPAddress* ptr_IPAddress = NULL;
{
unique_lock<recursive_mutex> o_LockIP(s_MutexIPAddresses);
fos::MutexGuard o_LockIP(s_MutexIPAddresses);
if (p_Index <= s_IPAddresses.size()) {
unordered_map<string, IPAddress*>::iterator i = next(s_IPAddresses.begin(), p_Index);
ptr_IPAddress = i->second;
@@ -140,7 +139,7 @@ SPITSocket::IPAddress* SPITSocket::getIPAddress(int p_Index) {
void SPITSocket::clearIPAddresses() {
IPAddress* o_IPAddress;
{
unique_lock<recursive_mutex> o_LockIP(s_MutexIPAddresses);
fos::MutexGuard o_LockIP(s_MutexIPAddresses);
for (auto i = s_IPAddresses.begin(); i != s_IPAddresses.end(); i++) {
o_IPAddress = i->second;
i = s_IPAddresses.erase(i);
@@ -156,7 +155,7 @@ void SPITSocket::clearIPAddresses() {
void SPITSocket::resetFoundIPAddresses() {
IPAddress* o_IPAddress;
{
unique_lock<recursive_mutex> o_LockIP(s_MutexIPAddresses);
fos::MutexGuard o_LockIP(s_MutexIPAddresses);
for (auto i = s_IPAddresses.begin(); i != s_IPAddresses.end(); i++) {
o_IPAddress = i->second;
o_IPAddress->setFound(false);
@@ -166,7 +165,7 @@ void SPITSocket::resetFoundIPAddresses() {
void SPITSocket::removeNotFoundIPAddresses() {
IPAddress* o_IPAddress;
{
unique_lock<recursive_mutex> o_LockIP(s_MutexIPAddresses);
fos::MutexGuard o_LockIP(s_MutexIPAddresses);
for (auto i = s_IPAddresses.begin(); i != s_IPAddresses.end(); i++) {
o_IPAddress = i->second;
if (o_IPAddress->getFound() == false) {