Author: jingham Date: Tue Feb 25 13:57:47 2014 New Revision: 202189 URL: http://llvm.org/viewvc/llvm-project?rev=202189&view=rev Log: Switch debugserver to detach on error by default, and change the flag to kill-on-error. Also fix the bug where lldb prints: "Got a connection and launched debugserver" rather than the name of the process it actually launched.
Modified: lldb/trunk/tools/debugserver/source/debugserver.cpp Modified: lldb/trunk/tools/debugserver/source/debugserver.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/debugserver.cpp?rev=202189&r1=202188&r2=202189&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/source/debugserver.cpp (original) +++ lldb/trunk/tools/debugserver/source/debugserver.cpp Tue Feb 25 13:57:47 2014 @@ -63,7 +63,7 @@ static nub_launch_flavor_t g_launch_flav int g_disable_aslr = 0; int g_isatty = 0; -bool g_detach_on_error = false; +bool g_detach_on_error = true; #define RNBLogSTDOUT(fmt, ...) do { if (g_isatty) { fprintf(stdout, fmt, ## __VA_ARGS__); } else { _DNBLog(0, fmt, ## __VA_ARGS__); } } while (0) #define RNBLogSTDERR(fmt, ...) do { if (g_isatty) { fprintf(stderr, fmt, ## __VA_ARGS__); } else { _DNBLog(0, fmt, ## __VA_ARGS__); } } while (0) @@ -831,7 +831,7 @@ static struct option g_long_options[] = { "attach", required_argument, NULL, 'a' }, { "arch", required_argument, NULL, 'A' }, { "debug", no_argument, NULL, 'g' }, - { "detach-on-error", no_argument, NULL, 'e' }, + { "kill-on-error", no_argument, NULL, 'K' }, { "verbose", no_argument, NULL, 'v' }, { "lockdown", no_argument, &g_lockdown_opt, 1 }, // short option "-k" { "applist", no_argument, &g_applist_opt, 1 }, // short option "-t" @@ -1030,8 +1030,8 @@ main (int argc, char *argv[]) } break; - case 'e': - g_detach_on_error = true; + case 'K': + g_detach_on_error = false; case 'W': if (optarg && optarg[0]) @@ -1536,7 +1536,12 @@ main (int argc, char *argv[]) } if (mode != eRNBRunLoopModeExit) - RNBLogSTDOUT ("Got a connection, launched process %s.\n", argv_sub_zero); + { + const char *proc_name = "<unknown>"; + if (ctx.ArgumentCount() > 0) + proc_name = ctx.ArgumentAtIndex(0); + RNBLogSTDOUT ("Got a connection, launched process %s (pid = %d).\n", proc_name, ctx.ProcessID()); + } } else { _______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits