[Lldb-commits] [lldb] r324251 - Sync PlatformNetBSD.cpp with Linux
Hans Wennborg via lldb-commits
lldb-commits at lists.llvm.org
Tue Feb 6 01:42:54 PST 2018
Merged to 6.0 in r324326.
On Mon, Feb 5, 2018 at 6:12 PM, Kamil Rytarowski via lldb-commits
<lldb-commits at lists.llvm.org> wrote:
> Author: kamil
> Date: Mon Feb 5 09:12:23 2018
> New Revision: 324251
>
> URL: http://llvm.org/viewvc/llvm-project?rev=324251&view=rev
> Log:
> Sync PlatformNetBSD.cpp with Linux
>
> Summary:
> Various changes in logging from log->Printf() to generic LLDB_LOG().
>
> Sponsored by <The NetBSD Foundation>
>
> Reviewers: labath, joerg
>
> Reviewed By: labath
>
> Subscribers: llvm-commits, lldb-commits
>
> Differential Revision: https://reviews.llvm.org/D42912
>
> Modified:
> lldb/trunk/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
>
> Modified: lldb/trunk/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
> URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp?rev=324251&r1=324250&r2=324251&view=diff
> ==============================================================================
> --- lldb/trunk/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp (original)
> +++ lldb/trunk/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp Mon Feb 5 09:12:23 2018
> @@ -45,19 +45,9 @@ static uint32_t g_initialize_count = 0;
>
> PlatformSP PlatformNetBSD::CreateInstance(bool force, const ArchSpec *arch) {
> Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PLATFORM));
> - if (log) {
> - const char *arch_name;
> - if (arch && arch->GetArchitectureName())
> - arch_name = arch->GetArchitectureName();
> - else
> - arch_name = "<null>";
> -
> - const char *triple_cstr =
> - arch ? arch->GetTriple().getTriple().c_str() : "<null>";
> -
> - log->Printf("PlatformNetBSD::%s(force=%s, arch={%s,%s})", __FUNCTION__,
> - force ? "true" : "false", arch_name, triple_cstr);
> - }
> + LLDB_LOG(log, "force = {0}, arch=({1}, {2})", force,
> + arch ? arch->GetArchitectureName() : "<null>",
> + arch ? arch->GetTriple().getTriple() : "<null>");
>
> bool create = force;
> if (create == false && arch && arch->IsValid()) {
> @@ -72,18 +62,10 @@ PlatformSP PlatformNetBSD::CreateInstanc
> }
> }
>
> + LLDB_LOG(log, "create = {0}", create);
> if (create) {
> - if (log)
> - log->Printf("PlatformNetBSD::%s() creating remote-netbsd platform",
> - __FUNCTION__);
> return PlatformSP(new PlatformNetBSD(false));
> }
> -
> - if (log)
> - log->Printf(
> - "PlatformNetBSD::%s() aborting creation of remote-netbsd platform",
> - __FUNCTION__);
> -
> return PlatformSP();
> }
>
> @@ -258,19 +240,15 @@ bool PlatformNetBSD::CanDebugProcess() {
> }
>
> // For local debugging, NetBSD will override the debug logic to use llgs-launch
> -// rather than
> -// lldb-launch, llgs-attach. This differs from current lldb-launch,
> -// debugserver-attach
> -// approach on MacOSX.
> -lldb::ProcessSP PlatformNetBSD::DebugProcess(
> - ProcessLaunchInfo &launch_info, Debugger &debugger,
> - Target *target, // Can be NULL, if NULL create a new
> - // target, else use existing one
> - Status &error) {
> +// rather than lldb-launch, llgs-attach. This differs from current lldb-launch,
> +// debugserver-attach approach on MacOSX.
> +lldb::ProcessSP
> +PlatformNetBSD::DebugProcess(ProcessLaunchInfo &launch_info, Debugger &debugger,
> + Target *target, // Can be NULL, if NULL create a new
> + // target, else use existing one
> + Status &error) {
> Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PLATFORM));
> - if (log)
> - log->Printf("PlatformNetBSD::%s entered (target %p)", __FUNCTION__,
> - static_cast<void *>(target));
> + LLDB_LOG(log, "target {0}", target);
>
> // If we're a remote host, use standard behavior from parent class.
> if (!IsHost())
> @@ -293,61 +271,42 @@ lldb::ProcessSP PlatformNetBSD::DebugPro
>
> // Ensure we have a target.
> if (target == nullptr) {
> - if (log)
> - log->Printf("PlatformNetBSD::%s creating new target", __FUNCTION__);
> -
> + LLDB_LOG(log, "creating new target");
> TargetSP new_target_sp;
> error = debugger.GetTargetList().CreateTarget(debugger, "", "", false,
> nullptr, new_target_sp);
> if (error.Fail()) {
> - if (log)
> - log->Printf("PlatformNetBSD::%s failed to create new target: %s",
> - __FUNCTION__, error.AsCString());
> + LLDB_LOG(log, "failed to create new target: {0}", error);
> return process_sp;
> }
>
> target = new_target_sp.get();
> if (!target) {
> error.SetErrorString("CreateTarget() returned nullptr");
> - if (log)
> - log->Printf("PlatformNetBSD::%s failed: %s", __FUNCTION__,
> - error.AsCString());
> + LLDB_LOG(log, "error: {0}", error);
> return process_sp;
> }
> - } else {
> - if (log)
> - log->Printf("PlatformNetBSD::%s using provided target", __FUNCTION__);
> }
>
> // Mark target as currently selected target.
> debugger.GetTargetList().SetSelectedTarget(target);
>
> // Now create the gdb-remote process.
> - if (log)
> - log->Printf(
> - "PlatformNetBSD::%s having target create process with gdb-remote plugin",
> - __FUNCTION__);
> + LLDB_LOG(log, "having target create process with gdb-remote plugin");
> process_sp = target->CreateProcess(
> launch_info.GetListenerForProcess(debugger), "gdb-remote", nullptr);
>
> if (!process_sp) {
> error.SetErrorString("CreateProcess() failed for gdb-remote process");
> - if (log)
> - log->Printf("PlatformNetBSD::%s failed: %s", __FUNCTION__,
> - error.AsCString());
> + LLDB_LOG(log, "error: {0}", error);
> return process_sp;
> - } else {
> - if (log)
> - log->Printf("PlatformNetBSD::%s successfully created process",
> - __FUNCTION__);
> }
>
> + LLDB_LOG(log, "successfully created process");
> // Adjust launch for a hijacker.
> ListenerSP listener_sp;
> if (!launch_info.GetHijackListener()) {
> - if (log)
> - log->Printf("PlatformNetBSD::%s setting up hijacker", __FUNCTION__);
> -
> + LLDB_LOG(log, "setting up hijacker");
> listener_sp =
> Listener::MakeListener("lldb.PlatformNetBSD.DebugProcess.hijack");
> launch_info.SetHijackListener(listener_sp);
> @@ -356,16 +315,13 @@ lldb::ProcessSP PlatformNetBSD::DebugPro
>
> // Log file actions.
> if (log) {
> - log->Printf(
> - "PlatformNetBSD::%s launching process with the following file actions:",
> - __FUNCTION__);
> -
> + LLDB_LOG(log, "launching process with the following file actions:");
> StreamString stream;
> size_t i = 0;
> const FileAction *file_action;
> while ((file_action = launch_info.GetFileActionAtIndex(i++)) != nullptr) {
> file_action->Dump(stream);
> - log->PutCString(stream.GetData());
> + LLDB_LOG(log, "{0}", stream.GetData());
> stream.Clear();
> }
> }
> @@ -378,16 +334,7 @@ lldb::ProcessSP PlatformNetBSD::DebugPro
> const StateType state = process_sp->WaitForProcessToStop(
> llvm::None, NULL, false, listener_sp);
>
> - if (state == eStateStopped) {
> - if (log)
> - log->Printf("PlatformNetBSD::%s pid %" PRIu64 " state %s\n",
> - __FUNCTION__, process_sp->GetID(), StateAsCString(state));
> - } else {
> - if (log)
> - log->Printf("PlatformNetBSD::%s pid %" PRIu64
> - " state is not stopped - %s\n",
> - __FUNCTION__, process_sp->GetID(), StateAsCString(state));
> - }
> + LLDB_LOG(log, "pid {0} state {0}", process_sp->GetID(), state);
> }
>
> // Hook up process PTY if we have one (which we should for local debugging
> @@ -395,20 +342,11 @@ lldb::ProcessSP PlatformNetBSD::DebugPro
> int pty_fd = launch_info.GetPTY().ReleaseMasterFileDescriptor();
> if (pty_fd != PseudoTerminal::invalid_fd) {
> process_sp->SetSTDIOFileDescriptor(pty_fd);
> - if (log)
> - log->Printf("PlatformNetBSD::%s pid %" PRIu64
> - " hooked up STDIO pty to process",
> - __FUNCTION__, process_sp->GetID());
> - } else {
> - if (log)
> - log->Printf("PlatformNetBSD::%s pid %" PRIu64
> - " not using process STDIO pty",
> - __FUNCTION__, process_sp->GetID());
> - }
> + LLDB_LOG(log, "hooked up STDIO pty to process");
> + } else
> + LLDB_LOG(log, "not using process STDIO pty");
> } else {
> - if (log)
> - log->Printf("PlatformNetBSD::%s process launch failed: %s", __FUNCTION__,
> - error.AsCString());
> + LLDB_LOG(log, "process launch failed: {0}", error);
> // FIXME figure out appropriate cleanup here. Do we delete the target? Do
> // we delete the process? Does our caller do that?
> }
>
>
> _______________________________________________
> lldb-commits mailing list
> lldb-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
More information about the lldb-commits
mailing list