a10: fixed a bug with OnRetireServer crashing with OpenFrameworks servers exiting.

Author: briangibson

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-CSharp-Editor.pidb

@@ -356,8 +356,7 @@ public static void OnTextureSizeChanged(int ptr, int width, int height){
 	public static void OnAnnounceServer(string appName, string name, string uuid, IntPtr serverPtr){
 //		 UnityEngine.Debug.Log("Announcing the server with the appName: "
 //		 + appName + ", name: " + name + ", uuid: " + uuid + " server Pointer: "+ (int)serverPtr);
-		
-		
+				
 		//if we don't yet have a key for that app, create a new dictionary entry.
 		if(!Syphon.Servers.ContainsKey(appName)){
 			Syphon.Servers.Add(appName, new Dictionary<string, SyphonServerObject>());
@@ -372,8 +371,7 @@ public static void OnAnnounceServer(string appName, string name, string uuid, In
 		//if it's not empty, just create a normal entry and SyphonServerObject.
 		else if(!Syphon.Servers[appName].ContainsKey(name)){			
 				Syphon.Servers[appName].Add(name, new SyphonServerObject(appName, name, uuid, serverPtr));			
-		}
-		
+		}		
 		//TODO: this is dumb, remove this.
 		Instance.UpdateServerNames();
 
@@ -401,38 +399,43 @@ public static void OnUpdateServer(string appName, string name, string uuid, IntP
 
 	[MonoPInvokeCallback (typeof (OnRetireServerDelegate))]
 	public static void OnRetireServer(string appName, string name,  string uuid){
-//		UnityEngine.Debug.Log(appName + " "+ name + " " + uuid + " are leaving now.");
+		string realAppName = "";
+		string realName = "";
 
 		//if there are any ACTIVE client singleton objects in use, 
 		//destroy them immediately.
 		//destroy their texture and destroy the pointer to them, and remove them from the SyphonClients list.
-		SyphonClientObject result = Syphon.GetSyphonClient(appName, name);
+		SyphonClientObject result = Syphon.GetSyphonClient(uuid);
 		if(result){
+			//because the Syphon callback may not have a valid appName and name key in the OnServerRetire Syphon callback, 
+			//we need to ensure we get the extract those cached names from the uuid/instance.
+			realAppName = result.BoundAppName;	
+			realName = result.BoundName;	
+
 			DestroyClient (result);
-		}
-		//-----------------------------
-				
-		//now remove the server name
-		//if it doesn't contain the appName key, you shouldn't have to do anything.
-		if(Syphon.Servers.ContainsKey(appName)){
-			if(name == ""){
+		}			
+		
+//		//now remove the server name
+//		//if it doesn't contain the appName key, you shouldn't have to do anything.
+		if(Syphon.Servers.ContainsKey(realAppName)){
+			if(realName == ""){
 				//if the name is UNNAMED_STRING and it contains the unnamed string, remove the server from the list.
-				if(Syphon.Servers[appName].ContainsKey(Syphon.UNNAMED_STRING)){
-					Syphon.Servers[appName].Remove(Syphon.UNNAMED_STRING);					
+				if(Syphon.Servers[realAppName].ContainsKey(Syphon.UNNAMED_STRING)){
+					Syphon.Servers[realAppName].Remove(Syphon.UNNAMED_STRING);					
 
 					//if there are no more objects in the dictionary list for that app, remove the associated appName entry
-					if(Syphon.Servers[appName].Count == 0){
-						Syphon.Servers.Remove(appName);
+					if(Syphon.Servers[realAppName].Count == 0){
+						Syphon.Servers.Remove(realAppName);
 					}
 				}
 			}
 			//if the name is valid and the server's app dictionary contains the name string, remove the server from the list.
-			else if(Syphon.Servers[appName].ContainsKey(name)){
-					Syphon.Servers[appName].Remove(name);
+			else if(Syphon.Servers[realAppName].ContainsKey(realName)){
+					Syphon.Servers[realAppName].Remove(realName);
 
 				//if there are no more entries in the dictionary list for that app, remove the associated appName entry
-				if(Syphon.Servers[appName].Count == 0){
-					Syphon.Servers.Remove(appName);
+				if(Syphon.Servers[realAppName].Count == 0){
+					Syphon.Servers.Remove(realAppName);
 				}
 			}
 
@@ -441,9 +444,9 @@ public static void OnRetireServer(string appName, string name,  string uuid){
 		}
 
 		if(RetireServer != null)
-			RetireServer(appName, name);	
+			RetireServer(realAppName, realName);	
+		
 
-	
 	}
 
 	public void UpdateServerNames(){
@@ -478,7 +481,12 @@ public static SyphonClientObject GetSyphonClient(string appName, string name){
 		return Syphon.SyphonClients.Find( delegate (SyphonClientObject obj) {			
 			return obj.MatchesDescription(appName, name);
 			});
-		
+	}
+
+	public static SyphonClientObject GetSyphonClient(string uuid){
+		return Syphon.SyphonClients.Find( delegate (SyphonClientObject obj) {			
+			return obj.MatchesDescription(uuid);
+			});
 	}
 
 	public static SyphonServerObject GetSyphonServer(string appName, string name){
@@ -499,22 +507,17 @@ public static SyphonServerObject GetSyphonServer(string appName, string name){
 	public static SyphonClientObject AddClientToSyphonClientsList(string appName, string name, SyphonServerObject server){		
 		SyphonClientObject result = GetSyphonClient(appName, name);
 		// Debug.Log(result.BoundAppName + " " + result.BoundName + " was the result");
-		//if it doesn't exist, create an instance of a SyphonClientObject, and init it.
-		//when we init it, we tell all our other syphonclienttextures that have registered to 
 		if(result == null){
 //			UnityEngine.Debug.Log("DIDNT EXIST: " + appName + "/" +name);
 			//if it was null when trying to add a new client, just add a new one and init.
 			result = ScriptableObject.CreateInstance<SyphonClientObject>();
 			result.DefineSyphonClient(server);
 			Syphon.SyphonClients.Add(result);
 		}
-		else{
-			
+		else{			
 //			UnityEngine.Debug.Log("EXISTED: " + appName + "/" +name + ". doing nothing.");
-//			result.DestroySyphonClient();
-//			result.DefineSyphonClient(server);
-//			result.InitSyphonClient();
 		}
+		
 		return result;
 	}
 

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-CSharp-firstpass.pidb

@@ -175,6 +175,12 @@ public bool MatchesDescription(string appName, string name){
 			return false;
 		}
 
+	public bool MatchesDescription(string uuid){
+			 if(uuid == attachedServer.SyphonServerDescriptionUUID){
+				return true;
+			}
+			return false;
+	}
 
 	public void UpdateServer(string appName, string name){
 		if(MatchesDescription(appName, name)){

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assembly-UnityScript-firstpass.pidb

@@ -7,15 +7,15 @@
 \f0\fs36 \cf0 Syphon for Unity Pro 4.0 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
 
-\fs20 \cf0 1.0 Public Beta 2 a9
+\fs20 \cf0 1.0 Public Beta 2 a10
 \fs36 \
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
 
 \fs24 \cf0 \
 This is an ongoing work. Please report any and all crashes/freezes, preferably including crash logs\
 \
-{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/syphon-implementations/issues"}}{\fldrslt http://code.google.com/p/syphon-implementations/issues}}\
-\
+{\field{\*\fldinst{HYPERLINK "https://github.com/Syphon/Unity3D/issues"}}{\fldrslt https://github.com/Syphon/Unity3D/issues\
+}}\
 If Unity freezes, see {\field{\*\fldinst{HYPERLINK "http://www.thexlab.com/faqs/activitymonitor.html"}}{\fldrslt http://www.thexlab.com/faqs/activitymonitor.html}} the section entitled 'sampling a process' and send us that log.\
 \
 If Unity crashes, see {\field{\*\fldinst{HYPERLINK "http://echoone.com/bugreports/console.html"}}{\fldrslt http://echoone.com/bugreports/console.html}} and send the relevant log.\
@@ -52,5 +52,6 @@ Syphon for Unity3D - Brian Chasalow (Unity 3D integration and scripting), Tom Bu
 
 \b \cf0 Release Notes:
 \b0 \
+a10: fixed a bug with OnRetireServer crashing with OpenFrameworks servers exiting.\
 a9: fixed some Unity 4.2 texture creation and 64 bit issues. uses custom Syphon framework with multithreading changes.\
 }

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/Syphon.cs

@@ -23,7 +23,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																						GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																																																					GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonObject/SyphonClientObject.cs

@@ -29,7 +29,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																					GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																																																				GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Plugins/SyphonUnityPlugin.bundle/Contents/MacOS/SyphonUnityPlugin

@@ -1,6 +1,13 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench />
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Plugins/Syphon.cs">
+    <Files>
+      <File FileName="Assets/Plugins/Syphon.cs" Line="403" Column="18" />
+      <File FileName="Assets/Plugins/SyphonObject/SyphonClientObject.cs" Line="93" Column="24" />
+      <File FileName="Assets/Plugins/SyphonTexture/SyphonClientTexture.cs" Line="1" Column="1" />
+      <File FileName="Assets/Plugins/SyphonObject/SyphonServerObject.cs" Line="1" Column="1" />
+    </Files>
+  </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Read Me.rtf

@@ -100,27 +100,26 @@ @implementation ServerWatcherUtility
 
 - (void)handleServerRetire:(NSNotification *)notification
 {
-//	dispatch_async(dispatch_get_main_queue(), ^(){
 
 	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
 
-	const char* param2 = [[[notification object] objectForKey:SyphonServerDescriptionNameKey] UTF8String];
 	const char* param1 = [[[notification object] objectForKey:SyphonServerDescriptionAppNameKey] UTF8String];
-	const char* param3 = [[[notification object] objectForKey:SyphonServerDescriptionUUIDKey] UTF8String];
-        
-//	MonoString* myString = mono_string_new(domain, param1);
-//	MonoString* myString2 = mono_string_new(domain, param2);
-//	MonoString* myString3 = mono_string_new(domain, param3);
-//	void *args[] = { myString, myString2, myString3 };
-//	mono_runtime_invoke(retireServer, NULL, args, NULL);
-//	param1 = NULL;
-//	param2 = NULL;
-//	param3 = NULL;
+	const char* param2 = [[[notification object] objectForKey:SyphonServerDescriptionNameKey] UTF8String];
+	const char* param3 = [[[[notification object] objectForKey:SyphonServerDescriptionUUIDKey] copy]UTF8String];
+
+//	NSLog(@"retiring: %s, %s, %s", param1, param2, param3);
+	if([[notification object] objectForKey:SyphonServerDescriptionNameKey] == nil){
+		//just ensure we don't send invalid strings...
+		param2 = param3;
+	}
+	if([[notification object] objectForKey:SyphonServerDescriptionAppNameKey] == nil){
+		//just ensure we don't send invalid strings...
+		param1 = param3;
+	}
 
 	OnRetireServerDelegate(param1, param2, param3);
 
 	[pool drain];
-//	});
 
 }
 
@@ -134,11 +133,11 @@ - (void)handleServerUpdate:(NSNotification *)notification
 	const char* param3 = [[[notification object] objectForKey:SyphonServerDescriptionUUIDKey] UTF8String];
 
 
-    NSUInteger serverPtr = 0;
+    void* serverPtr = 0;
     NSArray* serversArray = [[SyphonServerDirectory sharedDirectory] servers];
     for(NSDictionary* dict in serversArray){
         if([[notification object] objectForKey:SyphonServerDescriptionUUIDKey] == [dict objectForKey:SyphonServerDescriptionUUIDKey]){
-            serverPtr = (NSUInteger)dict;            
+            serverPtr = dict;
         }
     }
 
@@ -167,15 +166,17 @@ - (void)handleServerAnnounce:(NSNotification *)notification
 	const char* param3 = [[[notification object] objectForKey:SyphonServerDescriptionUUIDKey] UTF8String];
   //NSLog(@"announceing server! %s %s %s", param2, param1, param3);
 
-   NSUInteger serverPtr = 0;
+   void* serverPtr = 0;
     NSArray* serversArray = [[SyphonServerDirectory sharedDirectory] servers];
     for(NSDictionary* dict in serversArray){
         if([[notification object] objectForKey:SyphonServerDescriptionUUIDKey] == [dict objectForKey:SyphonServerDescriptionUUIDKey]){
-            serverPtr = (NSUInteger)dict;
+            serverPtr = dict;
         }
     }
-    
-//	MonoString* myString = mono_string_new(domain, param1);
+
+
+//	NSLog(@"announcing uuid %s, ptr is %li", param3, (unsigned long)serverPtr);
+	//	MonoString* myString = mono_string_new(domain, param1);
 //	MonoString* myString2 = mono_string_new(domain, param2);
 //	MonoString* myString3 = mono_string_new(domain, param3);
 //	void *args[] = { myString, myString2, myString3, &serverPtr };

Syphon Implementations/Unity3D/Unity3D-3_5/SyphonUnityExample/Assets/Resources/syphonSupportedShader 1.mat

@@ -94,10 +94,11 @@ void UnitySetGraphicsDevice (void* device, int deviceType, int eventType){
 
 
     void* CreateClientTexture(NSDictionary* serverPtr){
+//        NSLog(@"CREATED CLIENT TEXTURE AT %li, and added it to the list. count is now xx", ( long)serverPtr );
 		SyphonCacheData* clientPtr = new SyphonCacheData(serverPtr);
         //add it to a list
         syphonClients.push_back(clientPtr);
-//        NSLog(@"CREATED CLIENT TEXTURE AT %li, and added it to the list. count is now %i", (unsigned long)clientPtr, (int)syphonClients.size());
+
 		return clientPtr;
 	}
 
@@ -126,7 +127,7 @@ void KillClientTexture(SyphonCacheData* killMe){
 //                NSLog(@"removed one, count is now %i", (int)syphonClients.size());
             }
             //delete the cache data associated with it
-			NSLog(@"DESTROYED A CLIENT TEXTURE AT %li, count is now %i", (unsigned long)killMe, (int)syphonClients.size());
+//			NSLog(@"DESTROYED A CLIENT TEXTURE AT %li, count is now %i", (unsigned long)killMe, (int)syphonClients.size());
 
             delete killMe;
 			killMe->destroyMe = NO;
@@ -140,7 +141,7 @@ void KillClientTexture(SyphonCacheData* killMe){
 		SyphonCacheData* ptr = new SyphonCacheData();
         ptr->serverName = [[NSString alloc] initWithUTF8String:serverName];
 
-		NSLog(@"CREATIN SERVER TEXTURE AT: %li", (unsigned long)ptr);
+//		NSLog(@"CREATIN SERVER TEXTURE AT: %li", (unsigned long)ptr);
         //add it to a list
         syphonServers.push_back(ptr);
 		return ptr;
@@ -172,7 +173,7 @@ void UpdateTextureSizes(){
             list_iter != syphonClients.end(); list_iter++){
 
             if((*list_iter)->updateTextureSizeFlag){
-                NSLog(@"SOMETHING CHANGED");
+//                NSLog(@"SOMETHING CHANGED");
                 handleTextureSizeChanged(*list_iter);
                 (*list_iter)->updateTextureSizeFlag = false; 
             }