Ticket #10301: 0001-debug_server-Add-default-action-support.patch

src/servers/debug/DebugServer.cpp

@@ -1 +1 @@
 /*
- * Copyright 2011-2012, Rene Gollent, rene@gollent.com.
+ * Copyright 2011-2013, Rene Gollent, rene@gollent.com.
  * Copyright 2005-2009, Ingo Weinhold, bonefish@users.sf.net.
  * Distributed under the terms of the MIT License.
  */
@@ -19 +19 @@
 #include <Autolock.h>
 #include <Catalog.h>
 #include <debug_support.h>
+#include <driver_settings.h>
 #include <Entry.h>
 #include <FindDirectory.h>
 #include <Invoker.h>
@@ -26 +27 @@
 #include <Path.h>
 
 #include <MessengerPrivate.h>
+#include <RegExp.h>
 #include <RegistrarDefs.h>
 #include <RosterPrivate.h>
 #include <Server.h>
@@ -37 +39 @@
 enum {
     kActionKillTeam,
     kActionDebugTeam,
-    kActionSaveReportTeam
+    kActionSaveReportTeam,
+    kActionPromptUser
 };
 
 
@@ -65 +68 @@
 static const char *kSignature = "application/x-vnd.Haiku-debug_server";
 
 
+static int32 action_for_string(const char* action, int32 defaultAction)
+{
+    if (strcasecmp(action, "kill") == 0)
+        return kActionKillTeam;
+    else if (strcasecmp(action, "debug") == 0)
+        return kActionDebugTeam;
+    else if (strcasecmp(action, "log") == 0)
+        return kActionSaveReportTeam;
+    else if (strcasecmp(action, "user") == 0)
+        return kActionPromptUser;
+
+    return defaultAction;
+}
+
+
 static void
 KillTeam(team_id team, const char *appName = NULL)
 {
@@ -167 +185 @@
 private:
     TeamDebugHandlerRoster()
         :
-        BLocker("team debug handler roster")
+        BLocker("team debug handler roster"),
+        fDefaultDebugAction(kActionPromptUser)
     {
     }
 
@@ -185 +204 @@
         return sRoster;
     }
 
+    status_t Init()
+    {
+        status_t error = B_OK;
+        BPath path;
+        error = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
+        if (error != B_OK)
+            return error;
+
+        path.Append("system/debug_server/settings");
+        void* handle = load_driver_settings(path.Path());
+        if (handle) {
+            const driver_settings* settings = get_driver_settings(handle);
+            for (int i = 0; i < settings->parameter_count; i++) {
+                const driver_parameter& parameter = settings->parameters[i];
+                if (strcasecmp(parameter.name, "default_action") == 0
+                        && parameter.value_count > 0) {
+                    fDefaultDebugAction = action_for_string(
+                        parameter.values[0], fDefaultDebugAction);
+                } else if (strcasecmp(parameter.name, "executable_actions")
+                        == 0) {
+                    for (int j = 0; j < parameter.parameter_count; j++) {
+                        const driver_parameter &execParameter
+                            = parameter.parameters[j];
+                        if (execParameter.value_count > 0) {
+                            fDefaultActions[execParameter.name]
+                                = action_for_string(execParameter.values[0],
+                                    fDefaultDebugAction);
+                        }
+                    }
+                }
+            }
+
+            unload_driver_settings(handle);
+        }
+
+        return B_OK;
+    }
+
     bool AddHandler(TeamDebugHandler *handler)
     {
         if (!handler)
@@ -225 +282 @@
         return handler;
     }
 
+    int32 DefaultActionForTeam(const BString& teamName, bool& _matchFound) const
+    {
+        _matchFound = false;
+        RegExp expressionMatcher;
+        for (DefaultActionMap::const_iterator it = fDefaultActions.begin();
+                it != fDefaultActions.end(); ++it) {
+            if (expressionMatcher.SetPattern(it->first,
+                    RegExp::PATTERN_TYPE_WILDCARD)) {
+                BString value = teamName;
+                if (it->first[0] != '/') {
+                    // the expression in question is a team name match only,
+                    // so we need to extract that.
+                    BPath path(teamName);
+                    if (path.InitCheck() == B_OK)
+                        value = path.Leaf();
+                }
+                RegExp::MatchResult match = expressionMatcher.Match(value);
+                if (match.HasMatched()) {
+                    _matchFound = true;
+                    return it->second;
+                }
+            }
+        }
+
+        return fDefaultDebugAction;
+    }
+
     status_t DispatchMessage(DebugMessage *message)
     {
         if (!message)
@@ -269 +353 @@
 
 private:
     typedef map<team_id, TeamDebugHandler*> TeamDebugHandlerMap;
+    typedef map<BString, int32> DefaultActionMap;
 
     static TeamDebugHandlerRoster   *sRoster;
 
     TeamDebugHandlerMap             fHandlers;
+
+    int32                           fDefaultDebugAction;
+                                        // this indicates the default action
+                                        // to take on crash in the absence of
+                                        // a more specific match in the map.
+    DefaultActionMap                fDefaultActions;
+                                        // contains a set of string->action
+                                        // mappings for team names. Can contain
+                                        // wild cards.
+
 };
 
 TeamDebugHandlerRoster *TeamDebugHandlerRoster::sRoster = NULL;
@@ -693 +788 @@
 
     _PrintStackTrace(thread);
 
-    int32 debugAction = kActionKillTeam;
+    bool explicitActionFound = false;
+    int32 debugAction = TeamDebugHandlerRoster::Default()
+        ->DefaultActionForTeam(fExecutablePath, explicitActionFound);
 
     // ask the user whether to debug or kill the team
     if (_IsGUIServer()) {
         // App server, input server, or registrar. We always debug those.
-        debugAction = kActionDebugTeam;
-    } else if (USE_GUI && _AreGUIServersAlive() && _InitGUI() == B_OK) {
+        // if not specifically overridden.
+        if (!explicitActionFound)
+            debugAction = kActionDebugTeam;
+    } else if (debugAction == kActionPromptUser && USE_GUI
+        && _AreGUIServersAlive() && _InitGUI() == B_OK) {
         // normal app -- tell the user
         _NotifyAppServer(fTeam);
         _NotifyRegistrar(fTeam, true, false);
@@ -1154 +1254 @@
     close(console);
 
     // create the team debug handler roster
-    if (!TeamDebugHandlerRoster::CreateDefault()) {
+    TeamDebugHandlerRoster* roster = TeamDebugHandlerRoster::CreateDefault();
+    if (!roster) {
         debug_printf("debug_server: Failed to create team debug handler "
             "roster.\n");
         exit(1);
     }
 
+    // initialize roster settings
+    if (roster->Init() != B_OK) {
+        debug_printf("debug_server: Failed to initialize team debug handler "
+            "roster.\n");
+        exit(1);
+    }
+
     // create application
     DebugServer server(error);
     if (error != B_OK) {

src/servers/debug/Jamfile

@@ -13 +13 @@
     :
     be
     libdebug.so
+    libshared.a
     $(TARGET_LIBSTDC++)
     localestub
 ;