- IEC 61850 server: fixed compilation error in single thread mode

pull/228/head
Michael Zillgith 5 years ago
parent fa3c5dd256
commit 4a15e9987b

@ -524,16 +524,6 @@ IedServer_destroy(IedServer self)
#if ((CONFIG_MMS_SINGLE_THREADED == 1) && (CONFIG_MMS_THREADLESS_STACK == 0)) #if ((CONFIG_MMS_SINGLE_THREADED == 1) && (CONFIG_MMS_THREADLESS_STACK == 0))
/* trigger stopping background task thread */
if (self->mmsMapping->reportThreadRunning) {
self->mmsMapping->reportThreadRunning = false;
/* waiting for thread to finish */
while (self->mmsMapping->reportThreadFinished == false) {
Thread_sleep(10);
}
}
if (self->serverThread) if (self->serverThread)
Thread_destroy(self->serverThread); Thread_destroy(self->serverThread);
@ -599,8 +589,6 @@ singleThreadedServerThread(void* parameter)
if (DEBUG_IED_SERVER) if (DEBUG_IED_SERVER)
printf("IED_SERVER: server thread finished!\n"); printf("IED_SERVER: server thread finished!\n");
mmsMapping->reportThreadFinished = true;
} }
#endif /* (CONFIG_MMS_SINGLE_THREADED == 1) */ #endif /* (CONFIG_MMS_SINGLE_THREADED == 1) */
#endif /* (CONFIG_MMS_THREADLESS_STACK != 1) */ #endif /* (CONFIG_MMS_THREADLESS_STACK != 1) */
@ -614,7 +602,6 @@ IedServer_start(IedServer self, int tcpPort)
#if (CONFIG_MMS_SINGLE_THREADED == 1) #if (CONFIG_MMS_SINGLE_THREADED == 1)
MmsServer_startListeningThreadless(self->mmsServer, tcpPort); MmsServer_startListeningThreadless(self->mmsServer, tcpPort);
self->mmsMapping->reportThreadFinished = false;
self->mmsMapping->reportThreadRunning = true; self->mmsMapping->reportThreadRunning = true;
self->serverThread = Thread_create((ThreadExecutionFunction) singleThreadedServerThread, (void*) self, false); self->serverThread = Thread_create((ThreadExecutionFunction) singleThreadedServerThread, (void*) self, false);

@ -3076,10 +3076,11 @@ MmsMapping_stopEventWorkerThread(MmsMapping* self)
self->reportThreadRunning = false; self->reportThreadRunning = false;
if (self->reportWorkerThread) {
Thread_destroy(self->reportWorkerThread); Thread_destroy(self->reportWorkerThread);
self->reportWorkerThread = NULL; self->reportWorkerThread = NULL;
} }
}
} }
#endif /* (CONFIG_MMS_THREADLESS_STACK != 1) */ #endif /* (CONFIG_MMS_THREADLESS_STACK != 1) */

Loading…
Cancel
Save