stv0g/libiec61850
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- some code cleanup in mms_client_connection.c

Browse source
This commit is contained in:
Michael Zillgith 2017-08-20 10:22:54 +02:00
parent 291d21ef9e
commit 311c70ea30
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/mms/iso_mms/client/mms_client_connection.c
View file

@ -285,11 +285,9 @@ sendRequestAndWaitForResponse(MmsConnection self, uint32_t invokeId, ByteBuffer*
{
ByteBuffer* receivedMessage = NULL;
uint64_t startTime = Hal_getTimeInMs();
uint64_t currentTime = Hal_getTimeInMs();
uint64_t waitUntilTime = startTime + self->requestTimeout;
uint64_t currentTime = startTime;
uint64_t waitUntilTime = currentTime + self->requestTimeout;
bool success = false;
@ -311,15 +309,20 @@ sendRequestAndWaitForResponse(MmsConnection self, uint32_t invokeId, ByteBuffer*
goto connection_lost;
Semaphore_wait(self->lastResponseLock);
receivedInvokeId = self->responseInvokeId;
Semaphore_post(self->lastResponseLock);
if (receivedInvokeId == invokeId) {
receivedMessage = self->lastResponse;
Semaphore_post(self->lastResponseLock);
success = true;
break;
}
Semaphore_post(self->lastResponseLock);
Thread_sleep(10);
currentTime = Hal_getTimeInMs();
@ -331,7 +334,7 @@ sendRequestAndWaitForResponse(MmsConnection self, uint32_t invokeId, ByteBuffer*
self->lastResponseError = MMS_ERROR_SERVICE_TIMEOUT;
}
connection_lost:
connection_lost:
removeFromOutstandingCalls(self, invokeId);
@ -662,7 +665,7 @@ mmsIsoCallback(IsoIndication indication, void* parameter, ByteBuffer* payload)
self->concludeState = CONCLUDE_STATE_REQUESTED;
/* TODO block all new user requests */
/* TODO block all new user requests? */
IsoClientConnection_releaseReceiveBuffer(self->isoClient);
}
@ -697,6 +700,7 @@ mmsIsoCallback(IsoIndication indication, void* parameter, ByteBuffer* payload)
else {
if (checkForOutstandingCall(self, invokeId)) {
/* wait for application thread to handle last received response */
waitUntilLastResponseHasBeenProcessed(self);
Semaphore_wait(self->lastResponseLock);
@ -1047,11 +1051,9 @@ MmsConnection_getMmsConnectionParameters(MmsConnection self)
static void
waitForConnectResponse(MmsConnection self)
{
uint64_t startTime = Hal_getTimeInMs();
uint64_t currentTime = Hal_getTimeInMs();
uint64_t waitUntilTime = startTime + self->requestTimeout;
uint64_t currentTime = startTime;
uint64_t waitUntilTime = currentTime + self->requestTimeout;
while (currentTime < waitUntilTime) {
if (self->connectionState != MMS_CON_WAITING)
@ -1061,7 +1063,6 @@ waitForConnectResponse(MmsConnection self)
currentTime = Hal_getTimeInMs();
}
}
bool