Ticket #9039: DebugServerDesktopCrash.diff

src/servers/debug/DebugServer.cpp

@@ -24 +24 @@
 #include <Invoker.h>
 #include <Locale.h>
 #include <Path.h>
+#include "tracker_private.h"
 
 #include <MessengerPrivate.h>
 #include <RegistrarDefs.h>
@@ -139 +140 @@
     bool _IsInputServer() const;
     bool _IsRegistrar() const;
     bool _IsGUIServer() const;
+    bool _IsDesktop() const;
 
     static const char *_LastPathComponent(const char *path);
     static team_id _FindTeam(const char *name);
@@ -981 +983 @@
 }
 
 
+bool
+TeamDebugHandler::_IsDesktop() const
+{
+    app_info info;
+    BRoster roster;
+    if (roster.GetAppInfo(fExecutablePath, &info) == B_OK) {
+        if (strcmp(info.signature, kDeskbarSignature) == 0) {
+            TRACE(("debug_server: Deskbar Died!\n"));
+            return true;
+        } else if (strcmp(info.signature, kTrackerSignature) == 0) {
+            TRACE(("debug_server: Tracker Died!\n"));
+            return true;
+        }
+    }
+    return false;
+}
+
+
 const char *
 TeamDebugHandler::_LastPathComponent(const char *path)
 {

src/servers/debug/Jamfile

@@ -4 +4 @@
 UsePrivateHeaders debug ;
 UsePrivateHeaders kernel ;
 UsePrivateHeaders shared ;
+UsePrivateHeaders tracker ;
 
 AddResources debug_server : debug_server.rdef ;