Leahnaya/gba-link-connection
1
0
Fork 0
mirror of https://github.com/afska/gba-link-connection.git synced 2026-10-02 05:47:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding data race prevention

Browse Source
This commit is contained in:
Rodrigo Alfonso
2020-11-30 17:26:58 -03:00
parent c48079f6f8
commit ebc3736393
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/LinkConnection.h
View File

@@ -70,6 +70,7 @@ struct LinkState {
int _timeouts[LINK_MAX_PLAYERS];
bool _IRQFlag;
u32 _IRQTimeout;
bool _isLocked = false;
bool isConnected() {
return playerCount > 1 && currentPlayerId < playerCount;
@@ -79,11 +80,17 @@ struct LinkState {
if (playerId >= playerCount)
return false;
return !_incomingMessages[playerId].empty();
_isLocked = true;
bool hasMessage = !_incomingMessages[playerId].empty();
_isLocked = false;
return hasMessage;
}
u16 readMessage(u8 playerId) {
return LINK_QUEUE_POP(_incomingMessages[playerId]);
_isLocked = true;
u16 message = LINK_QUEUE_POP(_incomingMessages[playerId]);
_isLocked = false;
return message;
}
};
@@ -118,8 +125,8 @@ class LinkConnection {
bool isActive() { return isEnabled; }
void activate() {
isEnabled = true;
reset();
isEnabled = true;
}
void deactivate() {
@@ -132,11 +139,13 @@ class LinkConnection {
if (data == LINK_DISCONNECTED || data == LINK_NO_DATA)
return;
linkState->_isLocked = true;
push(linkState->_outgoingMessages, data);
linkState->_isLocked = false;
}
void _onVBlank() {
if (!isEnabled)
if (!isEnabled || linkState->_isLocked)
return;
if (!linkState->_IRQFlag)
@@ -146,7 +155,7 @@ class LinkConnection {
}
void _onTimer() {
if (!isEnabled)
if (!isEnabled || linkState->_isLocked)
return;
if (didTimeout()) {
@@ -159,7 +168,7 @@ class LinkConnection {
}
void _onSerial() {
if (!isEnabled)
if (!isEnabled || linkState->_isLocked)
return;
wait();