storytold/UE4-OSC
2
0
Fork 0
mirror of https://github.com/storytold/UE4-OSC.git synced 2026-10-22 07:55:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: listener stops randomly

Browse Source 
detail:
- task is running
- an OSC message is received, _pendingMessages is not yet empty
- task finishes before the OSC message is added to _pendingMessages
- no other task can be executed (_pendingMessages is never empty)
This commit is contained in:
monsieurgustav
2015-12-30 23:59:41 +01:00
parent bfe838e8a0
commit 65ee771d80
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSC/Source/OSC/Private/Receive/OscDispatcher.cpp
+7 -4
View File
@@ -165,8 +165,6 @@ static void SendBundle(TCircularQueue<std::pair<FName, TArray<FOscDataElemStruct
void UOscDispatcher::Callback(const FArrayReaderPtr& data, const FIPv4Endpoint&) void UOscDispatcher::Callback(const FArrayReaderPtr& data, const FIPv4Endpoint&)
{ {
const auto wasEmpty = _pendingMessages.IsEmpty();
const osc::ReceivedPacket packet((const char *)data->GetData(), data->Num()); const osc::ReceivedPacket packet((const char *)data->GetData(), data->Num());
if(packet.State() != osc::SUCCESS) if(packet.State() != osc::SUCCESS)
{ {
@@ -184,9 +182,9 @@ void UOscDispatcher::Callback(const FArrayReaderPtr& data, const FIPv4Endpoint&)
} }
// Set a single callback in the main thread per frame. // Set a single callback in the main thread per frame.
if(wasEmpty && !_pendingMessages.IsEmpty()) if(!_pendingMessages.IsEmpty() && !_runPendingMessagesTask)
{ {
FSimpleDelegateGraphTask::CreateAndDispatchWhenReady( _runPendingMessagesTask = FSimpleDelegateGraphTask::CreateAndDispatchWhenReady(
FSimpleDelegateGraphTask::FDelegate::CreateUObject(this, &UOscDispatcher::CallbackMainThread), FSimpleDelegateGraphTask::FDelegate::CreateUObject(this, &UOscDispatcher::CallbackMainThread),
TStatId(), TStatId(),
nullptr, nullptr,
@@ -205,6 +203,11 @@ void UOscDispatcher::Callback(const FArrayReaderPtr& data, const FIPv4Endpoint&)
void UOscDispatcher::CallbackMainThread() void UOscDispatcher::CallbackMainThread()
{ {
// Release before dequeue.
// If it was released after dequeue, when a message arrives after the while
// loop and before the release, it would not be processed.
_runPendingMessagesTask.SafeRelease();
FScopeLock ScopeLock(&_receiversMutex); FScopeLock ScopeLock(&_receiversMutex);
std::pair<FName, TArray<FOscDataElemStruct>> message; std::pair<FName, TArray<FOscDataElemStruct>> message;
OSC/Source/OSC/Private/Receive/OscDispatcher.h
+2 -1
View File
@@ -43,13 +43,14 @@ private:
void CallbackMainThread(); void CallbackMainThread();
void BeginDestroy() override; void BeginDestroy() override;
private: private:
TArray<IOscReceiverInterface *> _receivers; TArray<IOscReceiverInterface *> _receivers;
std::pair<FIPv4Address, uint32_t> _listening; std::pair<FIPv4Address, uint32_t> _listening;
FSocket * _socket; FSocket * _socket;
FUdpSocketReceiver * _socketReceiver; FUdpSocketReceiver * _socketReceiver;
TCircularQueue<std::pair<FName, TArray<FOscDataElemStruct>>> _pendingMessages; TCircularQueue<std::pair<FName, TArray<FOscDataElemStruct>>> _pendingMessages;
FGraphEventRef _runPendingMessagesTask;
/// Protects _receivers /// Protects _receivers
FCriticalSection _receiversMutex; FCriticalSection _receiversMutex;