Author: Alex Langford Date: 2023-08-17T10:32:23-07:00 New Revision: 90c5675a3db2319dd449a1753c79568355dfaaed
URL: https://github.com/llvm/llvm-project/commit/90c5675a3db2319dd449a1753c79568355dfaaed DIFF: https://github.com/llvm/llvm-project/commit/90c5675a3db2319dd449a1753c79568355dfaaed.diff LOG: [lldb][NFCI] Rewrite error-handling code in ProcessGDBRemote::MonitorDebugserverProcess I'm rewriting this for 2 reasons: 1) Although a 1024 char buffer is probably enough space, the error string may grow beyond that and we could lose some information. Using StringStream (as we do in the rest of ProcessGDBRemote) seems like a sensible solution. 2) I am planning on changing `UnixSignals::GetSignalAsCString`, rewriting things with `llvm::formatv` will make that process easier. Differential Revision: https://reviews.llvm.org/D158017 Added: Modified: lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 7eb29ee7baa11b..68c343903f3dc8 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -3379,23 +3379,20 @@ void ProcessGDBRemote::MonitorDebugserverProcess( if (state != eStateInvalid && state != eStateUnloaded && state != eStateExited && state != eStateDetached) { - char error_str[1024]; - if (signo) { - const char *signal_cstr = + StreamString stream; + if (signo == 0) + stream.Format(DEBUGSERVER_BASENAME " died with an exit status of {0:x8}", + exit_status); + else { + const char *signal_name = process_sp->GetUnixSignals()->GetSignalAsCString(signo); - if (signal_cstr) - ::snprintf(error_str, sizeof(error_str), - DEBUGSERVER_BASENAME " died with signal %s", signal_cstr); + const char *format_str = DEBUGSERVER_BASENAME " died with signal {0}"; + if (signal_name) + stream.Format(format_str, signal_name); else - ::snprintf(error_str, sizeof(error_str), - DEBUGSERVER_BASENAME " died with signal %i", signo); - } else { - ::snprintf(error_str, sizeof(error_str), - DEBUGSERVER_BASENAME " died with an exit status of 0x%8.8x", - exit_status); + stream.Format(format_str, signo); } - - process_sp->SetExitStatus(-1, error_str); + process_sp->SetExitStatus(-1, stream.GetString()); } // Debugserver has exited we need to let our ProcessGDBRemote know that it no // longer has a debugserver instance _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
