[Lldb-commits] [lldb] r243667 - Use only unnamed pipes to launch lldb-server gdbserver.

[Chaoren Lin]

Author: chaoren
Date: Thu Jul 30 12:48:44 2015
New Revision: 243667

URL: http://llvm.org/viewvc/llvm-project?rev=243667&view=rev
Log:
Use only unnamed pipes to launch lldb-server gdbserver.

Summary:
If we used unnamed pipes instead of named pipes, we can avoid having the
file system littered with debugserver-named-pipes if lldb-server happens to
crash for whatever reason. Also, on some buggy systems, it's possible to be
able to create but not to delete a fifo. Ideally, support for unnamed pipes
should be added to debugserver as well, so we can avoid the `#ifdef` here.

Reviewers: clayborg, vharron, chying

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D11609

Modified:
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp?rev=243667&r1=243666&r2=243667&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Thu Jul 30 12:48:44 2015
@@ -1200,35 +1200,37 @@ GDBRemoteCommunication::StartDebugserver
             // output of the command into this file. We will later read this file
             // if all goes well and fill the data into "command_output_ptr"
 
+#if defined(__APPLE__)
             // Binding to port zero, we need to figure out what port it ends up
             // using using a named pipe...
             error = port_pipe.CreateWithUniqueName("debugserver-named-pipe", false, named_pipe_path);
-            if (error.Success())
+            if (error.Fail())
             {
-                debugserver_args.AppendArgument("--named-pipe");
-                debugserver_args.AppendArgument(named_pipe_path.c_str());
+                if (log)
+                    log->Printf("GDBRemoteCommunication::%s() "
+                            "named pipe creation failed: %s",
+                            __FUNCTION__, error.AsCString());
+                return error;
             }
-            else
+            debugserver_args.AppendArgument("--named-pipe");
+            debugserver_args.AppendArgument(named_pipe_path.c_str());
+#else
+            // Binding to port zero, we need to figure out what port it ends up
+            // using using an unnamed pipe...
+            error = port_pipe.CreateNew(true);
+            if (error.Fail())
             {
                 if (log)
                     log->Printf("GDBRemoteCommunication::%s() "
-                            "named pipe creation failed: %s",
+                            "unnamed pipe creation failed: %s",
                             __FUNCTION__, error.AsCString());
-                // let's try an unnamed pipe
-                error = port_pipe.CreateNew(true);
-                if (error.Fail())
-                {
-                    if (log)
-                        log->Printf("GDBRemoteCommunication::%s() "
-                                "unnamed pipe creation failed: %s",
-                                __FUNCTION__, error.AsCString());
-                    return error;
-                }
-                int write_fd = port_pipe.GetWriteFileDescriptor();
-                debugserver_args.AppendArgument("--pipe");
-                debugserver_args.AppendArgument(std::to_string(write_fd).c_str());
-                launch_info.AppendCloseFileAction(port_pipe.GetReadFileDescriptor());
+                return error;
             }
+            int write_fd = port_pipe.GetWriteFileDescriptor();
+            debugserver_args.AppendArgument("--pipe");
+            debugserver_args.AppendArgument(std::to_string(write_fd).c_str());
+            launch_info.AppendCloseFileAction(port_pipe.GetReadFileDescriptor());
+#endif
         }
         else
         {