[debugserver] Extract function for default launch flavor

[kastiglione]

Summary

Extract a function for turning eLaunchFlavorDefault into a concreate eLaunchFlavor value.

This new function encapsulates the few compile time variables involved, and also prevents clang unused code diagnostics.

[kastiglione]

Follow up to 8aeb212887024a615ca02437cd12fa055bd54b6f

[kastiglione]

clang-format

[teemperor]

LGTM, thanks for the cleanup! (And also having the second list of comments no longer always stating 'SpringBoard' is even better).

[kastiglione]

@teemperor I'm not sure what these build errors mean, for example https://reviews.llvm.org/B70998. Also there's the linux build failure, but that's not relevant for debugserver, right?

[teemperor]

In D87327#2263971, @kastiglione wrote:

@teemperor I'm not sure what these build errors mean, for example https://reviews.llvm.org/B70998. Also there's the linux build failure, but that's not relevant for debugserver, right?

You can usually ignore premerge checks that aren't clang-format complaining. And for linux buildbot failures I think that's also fine as they don't build debug server from what I know.

lldb/tools/debugserver/source/debugserver.cpp

while (true) {
                          __FUNCTION__);
         return eRNBRunLoopModeExit;
       }
     }
   }
   return eRNBRunLoopModeExit;
 }
 
+static nub_launch_flavor_t default_launch_flavor(const char *app_name) {
+#if defined(WITH_FBS) || defined(WITH_BKS) || defined(WITH_SPRINGBOARD)
   // Check the name to see if it ends with .app
-static bool is_dot_app (const char *app_name) {
+  auto is_dot_app = [](const char *app_name) {
     size_t len = strlen(app_name);
     if (len < 4)
       return false;
-  
-  if (app_name[len - 4] == '.' &&
-      app_name[len - 3] == 'a' && 
-      app_name[len - 2] == 'p' &&
-      app_name[len - 1] == 'p')
+    if (app_name[len - 4] == '.' && app_name[len - 3] == 'a' &&
+        app_name[len - 2] == 'p' && app_name[len - 1] == 'p')
       return true;
     return false;
+  };
+
+  if (is_dot_app(app_name)) {
+#if defined WITH_FBS
+    // Check if we have an app bundle, if so launch using FrontBoard Services.
+    return eLaunchFlavorFBS;
+#elif defined WITH_BKS
+    // Check if we have an app bundle, if so launch using BackBoard Services.
+    return eLaunchFlavorBKS;
+#elif defined WITH_SPRINGBOARD
+    // Check if we have an app bundle, if so launch using SpringBoard.
+    return eLaunchFlavorSpringBoard;
+#endif
+  }
+#endif
+
+  // Our default launch method is posix spawn
+  return eLaunchFlavorPosixSpawn;
 }
 
 // This run loop mode will wait for the process to launch and hit its
 // entry point. It will currently ignore all events except for the
 // process state changed event, where it watches for the process stopped
 // or crash process state.
 RNBRunLoopMode RNBRunLoopLaunchInferior(RNBRemote *remote,
                                         const char *stdin_path,
RNBRunLoopMode RNBRunLoopLaunchInferior(RNBRemote *remote,
 
   for (i = 0; i < inferior_envc; i++)
     inferior_envp[i] = ctx.EnvironmentAtIndex(i);
 
   // Our launch type hasn't been set to anything concrete, so we need to
   // figure our how we are going to launch automatically.
 
   nub_launch_flavor_t launch_flavor = g_launch_flavor;
-  if (launch_flavor == eLaunchFlavorDefault) {
-    // Our default launch method is posix spawn
-    launch_flavor = eLaunchFlavorPosixSpawn;
-
-    const bool dot_app = is_dot_app(inferior_argv[0]);
-    (void)dot_app;
-#if defined WITH_FBS
-    // Check if we have an app bundle, if so launch using BackBoard Services.
-    if (dot_app) {
-      launch_flavor = eLaunchFlavorFBS;
-    }
-#elif defined WITH_BKS
-    // Check if we have an app bundle, if so launch using BackBoard Services.
-    if (dot_app) {
-      launch_flavor = eLaunchFlavorBKS;
-    }
-#elif defined WITH_SPRINGBOARD
-    // Check if we have an app bundle, if so launch using SpringBoard.
-    if (dot_app) {
-      launch_flavor = eLaunchFlavorSpringBoard;
-    }
-#endif
-  }
+  if (launch_flavor == eLaunchFlavorDefault)
+    launch_flavor = default_launch_flavor(inferior_argv[0]);
 
   ctx.SetLaunchFlavor(launch_flavor);
   char resolved_path[PATH_MAX];
 
   // If we fail to resolve the path to our executable, then just use what we
   // were given and hope for the best
   if (!DNBResolveExecutablePath(inferior_argv[0], resolved_path,
                                 sizeof(resolved_path)))
case eRNBRunLoopModeInferiorAttaching:
         // option that may have been specified
         struct timespec attach_timeout_abstime, *timeout_ptr = NULL;
         if (waitfor_duration != 0) {
           DNBTimer::OffsetTimeOfDay(&attach_timeout_abstime, waitfor_duration,
                                     0);
           timeout_ptr = &attach_timeout_abstime;
         }
         nub_launch_flavor_t launch_flavor = g_launch_flavor;
-        if (launch_flavor == eLaunchFlavorDefault) {
-          // Our default launch method is posix spawn
-          launch_flavor = eLaunchFlavorPosixSpawn;
-
-#if defined WITH_FBS
-          // Check if we have an app bundle, if so launch using SpringBoard.
-          if (is_dot_app(waitfor_pid_name.c_str())) {
-            launch_flavor = eLaunchFlavorFBS;
-          }
-#elif defined WITH_BKS
-          // Check if we have an app bundle, if so launch using SpringBoard.
-          if (is_dot_app(waitfor_pid_name.c_str())) {
-            launch_flavor = eLaunchFlavorBKS;
-          }
-#elif defined WITH_SPRINGBOARD
-          // Check if we have an app bundle, if so launch using SpringBoard.
-          if (is_dot_app(waitfor_pid_name.c_str())) {
-            launch_flavor = eLaunchFlavorSpringBoard;
-          }
-#endif
-        }
+        if (launch_flavor == eLaunchFlavorDefault)
+          launch_flavor = default_launch_flavor(waitfor_pid_name.c_str());
 
         ctx.SetLaunchFlavor(launch_flavor);
         bool ignore_existing = false;
         RNBLogSTDOUT("Waiting to attach to process %s...\n",
                      waitfor_pid_name.c_str());
         nub_process_t pid = DNBProcessAttachWait(
             waitfor_pid_name.c_str(), launch_flavor, ignore_existing,
             timeout_ptr, waitfor_interval, err_str, sizeof(err_str));