[critical bug fix] Osc scope2 (#7981)

#changelog #addon

Author: artificiel

addons/ofxOsc/libs/oscpack/src/ip/posix/UdpSocket.cpp

@@ -56,6 +56,7 @@
 #include <cstring> // for memset
 #include <stdexcept>
 #include <vector>
+#include <atomic>
 
 #include "ip/PacketListener.h"
 #include "ip/TimerListener.h"

addons/ofxOsc/src/ofxOscReceiver.cpp

@@ -96,19 +96,11 @@ bool ofxOscReceiver::start() {
 		}
 	});
 
-	// detach thread so we don't have to wait on it before creating a new socket
-	// or on destruction, the custom deleter for the socket unique_ptr already
-	// does the right thing
-	
-#ifndef OSC_NO_DETACH
-	listenThread.detach();
-#endif
 	return true;
 }
 
 //--------------------------------------------------------------
 void ofxOscReceiver::stop() {
-#ifdef OSC_NO_DETACH
 	if (listenSocket) {
 		listenSocket->AsynchronousBreak();
 	} else {
@@ -120,7 +112,6 @@ void ofxOscReceiver::stop() {
 	} else {
 		listenThread.join();
 	}
-#endif
 	listenSocket.reset();
 }
 

apps/devApps/StressofxOscReceiver/src/ofApp.cpp

@@ -1,6 +1,6 @@
 #include "ofApp.h"
 
-#define USE_EXPLICIT_FUNCTION 1
+//#define USE_EXPLICIT_FUNCTION 1
 
 #define INSTANTLY_OUT_OF_SCOPE 1
 
@@ -11,8 +11,9 @@ void ofApp::setup(){
 	ofSetVerticalSync(false);
 
 #ifdef INSTANTLY_OUT_OF_SCOPE
-	ofLogNotice("will hang");
-	ofxOscReceiver r;
+	ofLogNotice("will hang if thread problem");
+	std::unique_ptr<ofxOscReceiver> r = std::make_unique<ofxOscReceiver>();
+	r = std::make_unique<ofxOscReceiver>();
 #endif
 	ofLogNotice("ready to roll");