Make FileAction not be a nested class, and move AddPosixSpawnFileAction from ProcessLaunchInfo to Host.

[zturner]

Summary

Previously FileAction was nested in ProcessLaunchInfo. This patch moves it into its own header file. This allows us to move the AddPosixSpawnFileAction function into Host, instead of being in Target. This was causing problems previously, because it required LLDB_DISABLE_POSIX to be checked from a header file, which put a burden on programmers to remember to #include Host/Config.h before including ProcessLaunchInfo, which kind of doesn't make sense and violates the Host / Target layer separation.

Since whether posix_spawn can be used is inherently host-specific, it makes more sense for this functionality to live inside of Host, which is what this patch addresses.

[zturner]

Fixed up the Xcode project to contain the new files. First time ever using a Mac, so please check that I did this correctly.

I've now compiled this patch on Windows, Linux, and Mac, and tests pass on all 3.

[zturner]

Closed by commit rL215649 (authored by @zturner).

lldb/trunk/include/lldb/Host/Host.h

 
 #include "lldb/lldb-private.h"
 #include "lldb/Core/StringList.h"
 #include "lldb/Host/File.h"
 #include "lldb/Host/FileSpec.h"
 
 namespace lldb_private {
 
+class FileAction;
+class ProcessLaunchInfo;
+
 //----------------------------------------------------------------------
 /// @class Host Host.h "lldb/Host/Host.h"
 /// @brief A class that provides host computer information.
 ///
 /// Host is a class that answers information about the host operating
 /// system.
 //----------------------------------------------------------------------
 class Host
public:
     GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &proc_info);
 
 #if defined (__APPLE__) || defined (__linux__) || defined (__FreeBSD__) || defined (__GLIBC__) || defined (__NetBSD__)
     static short
     GetPosixspawnFlags (ProcessLaunchInfo &launch_info);
 
     static Error
     LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t &pid);
+
+    static bool AddPosixSpawnFileAction(void *file_actions, const FileAction *info, Log *log, Error &error);
 #endif
 
     static lldb::pid_t
     LaunchApplication (const FileSpec &app_file_spec);
 
     static Error
     LaunchProcess (ProcessLaunchInfo &launch_info);
 

lldb/trunk/include/lldb/Target/FileAction.h

+//===-- ProcessLaunchInfo.h -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_Target_FileAction_h
+#define liblldb_Target_FileAction_h
+
+#include <string>
+
+namespace lldb_private
+{
+
+class FileAction
+{
+  public:
+    enum Action
+    {
+        eFileActionNone,
+        eFileActionClose,
+        eFileActionDuplicate,
+        eFileActionOpen
+    };
+
+    FileAction();
+
+    void Clear();
+
+    bool Close(int fd);
+
+    bool Duplicate(int fd, int dup_fd);
+
+    bool Open(int fd, const char *path, bool read, bool write);
+
+    int GetFD() const { return m_fd; }
+
+    Action GetAction() const { return m_action; }
+
+    int GetActionArgument() const { return m_arg; }
+
+    const char *GetPath() const;
+
+  protected:
+    Action m_action;    // The action for this file
+    int m_fd;           // An existing file descriptor
+    int m_arg;          // oflag for eFileActionOpen*, dup_fd for eFileActionDuplicate
+    std::string m_path; // A file path to use for opening after fork or posix_spawn
+};
+
+} // namespace lldb_private
+
+#endif

lldb/trunk/include/lldb/Target/ProcessLaunchInfo.h

 #define liblldb_ProcessLaunch_Info_h
 
 // C++ Headers
 #include <string>
 
 // LLDB Headers
 #include "lldb/Core/Flags.h"
 #include "lldb/Host/Host.h"
+#include "lldb/Target/FileAction.h"
 #include "lldb/Target/ProcessInfo.h"
 #include "lldb/Utility/PseudoTerminal.h"
 
 namespace lldb_private
 {
 
     //----------------------------------------------------------------------
     // ProcessLaunchInfo
     //
     // Describes any information that is required to launch a process.
     //----------------------------------------------------------------------
 
     class ProcessLaunchInfo : public ProcessInfo
     {
     public:
 
-        class FileAction
-        {
-        public:
-            enum Action
-            {
-                eFileActionNone,
-                eFileActionClose,
-                eFileActionDuplicate,
-                eFileActionOpen
-            };
-
-            FileAction ();
-
-            void
-            Clear();
-
-            bool
-            Close (int fd);
-
-            bool
-            Duplicate (int fd, int dup_fd);
-
-            bool
-            Open (int fd, const char *path, bool read, bool write);
-
-    #ifndef LLDB_DISABLE_POSIX
-            static bool
-            AddPosixSpawnFileAction (void *file_actions,
-                                     const FileAction *info,
-                                     Log *log,
-                                     Error& error);
-    #endif
-
-            int
-            GetFD () const
-            {
-                return m_fd;
-            }
-
-            Action
-            GetAction () const
-            {
-                return m_action;
-            }
-
-            int
-            GetActionArgument () const
-            {
-                return m_arg;
-            }
-
-            const char *
-            GetPath () const;
-
-        protected:
-            Action m_action;    // The action for this file
-            int m_fd;           // An existing file descriptor
-            int m_arg;          // oflag for eFileActionOpen*, dup_fd for eFileActionDuplicate
-            std::string m_path; // A file path to use for opening after fork or posix_spawn
-        };
-
         ProcessLaunchInfo ();
 
         ProcessLaunchInfo (const char *stdin_path,
                            const char *stdout_path,
                            const char *stderr_path,
                            const char *working_directory,
                            uint32_t launch_flags);
 

lldb/trunk/lldb.xcodeproj/project.pbxproj

/* Begin PBXBuildFile section */
     26F5C32D10F3DFDD009D5894 /* libtermcap.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32B10F3DFDD009D5894 /* libtermcap.dylib */; };
     26F73062139D8FDB00FD51C7 /* History.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26F73061139D8FDB00FD51C7 /* History.cpp */; };
     26FFC19914FC072100087D58 /* AuxVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FFC19314FC072100087D58 /* AuxVector.cpp */; };
     26FFC19A14FC072100087D58 /* AuxVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FFC19414FC072100087D58 /* AuxVector.h */; };
     26FFC19B14FC072100087D58 /* DYLDRendezvous.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FFC19514FC072100087D58 /* DYLDRendezvous.cpp */; };
     26FFC19C14FC072100087D58 /* DYLDRendezvous.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FFC19614FC072100087D58 /* DYLDRendezvous.h */; };
     26FFC19D14FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FFC19714FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp */; };
     26FFC19E14FC072100087D58 /* DynamicLoaderPOSIXDYLD.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FFC19814FC072100087D58 /* DynamicLoaderPOSIXDYLD.h */; };
+    3FDFDDBD199C3A06009756A7 /* FileAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FDFDDBC199C3A06009756A7 /* FileAction.cpp */; };
     449ACC98197DEA0B008D175E /* FastDemangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 449ACC96197DE9EC008D175E /* FastDemangle.cpp */; };
     490A36C0180F0E6F00BA31F8 /* PlatformWindows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 490A36BD180F0E6F00BA31F8 /* PlatformWindows.cpp */; };
     490A36C2180F0E9300BA31F8 /* PlatformWindows.h in Headers */ = {isa = PBXBuildFile; fileRef = 490A36BE180F0E6F00BA31F8 /* PlatformWindows.h */; };
     490A966B1628C3BF00F0002E /* SBDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = 9452573816262CEF00325455 /* SBDeclaration.h */; settings = {ATTRIBUTES = (Public, ); }; };
     494260DA14579144003C1C78 /* VerifyDecl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 494260D914579144003C1C78 /* VerifyDecl.cpp */; };
     4966DCC4148978A10028481B /* ClangExternalASTSourceCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4966DCC3148978A10028481B /* ClangExternalASTSourceCommon.cpp */; };
     49A1CAC51430E8DE00306AC9 /* ExpressionSourceCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A1CAC31430E8BD00306AC9 /* ExpressionSourceCode.cpp */; };
     49A71FE7141FFA5C00D59478 /* IRInterpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 496B01581406DE8900F830D5 /* IRInterpreter.cpp */; };
/* Begin PBXFileReference section */
     26FA4315130103F400E71120 /* FileSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileSpec.h; path = include/lldb/Host/FileSpec.h; sourceTree = "<group>"; };
     26FA43171301048600E71120 /* FileSpec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSpec.cpp; sourceTree = "<group>"; };
     26FFC19314FC072100087D58 /* AuxVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AuxVector.cpp; sourceTree = "<group>"; };
     26FFC19414FC072100087D58 /* AuxVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuxVector.h; sourceTree = "<group>"; };
     26FFC19514FC072100087D58 /* DYLDRendezvous.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DYLDRendezvous.cpp; sourceTree = "<group>"; };
     26FFC19614FC072100087D58 /* DYLDRendezvous.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DYLDRendezvous.h; sourceTree = "<group>"; };
     26FFC19714FC072100087D58 /* DynamicLoaderPOSIXDYLD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DynamicLoaderPOSIXDYLD.cpp; sourceTree = "<group>"; };
     26FFC19814FC072100087D58 /* DynamicLoaderPOSIXDYLD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLoaderPOSIXDYLD.h; sourceTree = "<group>"; };
+    3FDFD6C3199C396E009756A7 /* FileAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileAction.h; path = include/lldb/Target/FileAction.h; sourceTree = "<group>"; };
+    3FDFDDBC199C3A06009756A7 /* FileAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileAction.cpp; path = source/Target/FileAction.cpp; sourceTree = "<group>"; };
     449ACC96197DE9EC008D175E /* FastDemangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FastDemangle.cpp; path = source/Core/FastDemangle.cpp; sourceTree = "<group>"; };
     4906FD4012F2255300A2A77C /* ASTDumper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASTDumper.cpp; path = source/Expression/ASTDumper.cpp; sourceTree = "<group>"; };
     4906FD4412F2257600A2A77C /* ASTDumper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASTDumper.h; path = include/lldb/Expression/ASTDumper.h; sourceTree = "<group>"; };
     490A36BD180F0E6F00BA31F8 /* PlatformWindows.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformWindows.cpp; sourceTree = "<group>"; };
     490A36BE180F0E6F00BA31F8 /* PlatformWindows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWindows.h; sourceTree = "<group>"; };
     4911934B1226383D00578B7F /* ASTStructExtractor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASTStructExtractor.h; path = include/lldb/Expression/ASTStructExtractor.h; sourceTree = "<group>"; };
     491193501226386000578B7F /* ASTStructExtractor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASTStructExtractor.cpp; path = source/Expression/ASTStructExtractor.cpp; sourceTree = "<group>"; };
     49307AAD11DEA4D90081F992 /* IRForTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IRForTarget.cpp; path = source/Expression/IRForTarget.cpp; sourceTree = "<group>"; };
26BC7DDF10F1B7E200F91463 /* Interpreter */ = {
         26BC7F0C10F1B8DD00F91463 /* ScriptInterpreterPython.cpp */,
       );
       name = Interpreter;
       sourceTree = "<group>";
     };
     26BC7DEF10F1B80200F91463 /* Target */ = {
       isa = PBXGroup;
       children = (
+        3FDFD6C3199C396E009756A7 /* FileAction.h */,
+        3FDFDDBC199C3A06009756A7 /* FileAction.cpp */,
         23EDE3311926843600F6A132 /* NativeRegisterContext.h */,
         23EDE3301926839700F6A132 /* NativeRegisterContext.cpp */,
         497E7B331188ED300065CCA1 /* ABI.h */,
         497E7B9D1188F6690065CCA1 /* ABI.cpp */,
         4CB443BB1249920C00C13DC2 /* CPPLanguageRuntime.h */,
         4CB443BC1249920C00C13DC2 /* CPPLanguageRuntime.cpp */,
         26BC7DF110F1B81A00F91463 /* DynamicLoader.h */,
         26BC7E7710F1B85900F91463 /* DynamicLoader.cpp */,
2689FFC613353D7A00698AC0 /* Sources */ = {
         26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources */,
         26BD407F135D2AE000237D80 /* FileLineResolver.cpp in Sources */,
         26A7A035135E6E4200FB369E /* OptionValue.cpp in Sources */,
         9A22A161135E30370024DDC3 /* EmulateInstructionARM.cpp in Sources */,
         9A22A163135E30370024DDC3 /* EmulationStateARM.cpp in Sources */,
         9A4F35101368A51A00823F52 /* StreamAsynchronousIO.cpp in Sources */,
         2692BA15136610C100F9E14D /* UnwindAssemblyInstEmulation.cpp in Sources */,
         263E949F13661AEA00E7D1CE /* UnwindAssembly-x86.cpp in Sources */,
+        3FDFDDBD199C3A06009756A7 /* FileAction.cpp in Sources */,
         264D8D5013661BD7003A368F /* UnwindAssembly.cpp in Sources */,
         AF23B4DB19009C66003E2A58 /* FreeBSDSignals.cpp in Sources */,
         26ECA04313665FED008D1F18 /* ARM_DWARF_Registers.cpp in Sources */,
         AF061F87182C97ED00B6A19C /* RegisterContextHistory.cpp in Sources */,
         AF26703B1852D01E00B6CC36 /* QueueList.cpp in Sources */,
         267C012B136880DF006E963E /* OptionGroupValueObjectDisplay.cpp in Sources */,
         26BCFC521368AE38006DC050 /* OptionGroupFormat.cpp in Sources */,
         AF81DEFA1828A23F0042CF19 /* SystemRuntime.cpp in Sources */,

lldb/trunk/source/Host/common/Host.cpp

 #include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/ThreadSafeSTLMap.h"
 #include "lldb/Host/Config.h"
 #include "lldb/Host/Endian.h"
 #include "lldb/Host/FileSpec.h"
 #include "lldb/Host/Mutex.h"
+#include "lldb/Target/FileAction.h"
 #include "lldb/Target/Process.h"
+#include "lldb/Target/ProcessLaunchInfo.h"
 #include "lldb/Target/TargetList.h"
 #include "lldb/Utility/CleanUp.h"
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
if (num_file_actions > 0)
             return error;
 
         // Make a quick class that will cleanup the posix spawn attributes in case
         // we return in the middle of this function.
         lldb_utility::CleanUp <posix_spawn_file_actions_t *, int> posix_spawn_file_actions_cleanup (&file_actions, posix_spawn_file_actions_destroy);
 
         for (size_t i=0; i<num_file_actions; ++i)
         {
-            const ProcessLaunchInfo::FileAction *launch_file_action = launch_info.GetFileActionAtIndex(i);
+            const FileAction *launch_file_action = launch_info.GetFileActionAtIndex(i);
             if (launch_file_action)
             {
-                if (!ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (&file_actions,
+                if (!AddPosixSpawnFileAction (&file_actions,
                                                                              launch_file_action,
                                                                              log,
                                                                              error))
                     return error;
             }
         }
 
         error.SetError (::posix_spawnp (&pid,
#else
                     current_dir);
         }
 #endif
     }
 
     return error;
 }
 
+bool Host::AddPosixSpawnFileAction(void *_file_actions, const FileAction *info, Log *log, Error &error)
+{
+    if (info == NULL)
+        return false;
+
+    posix_spawn_file_actions_t *file_actions = reinterpret_cast<posix_spawn_file_actions_t *>(_file_actions);
+
+    switch (info->GetAction())
+    {
+    case FileAction::eFileActionNone:
+        error.Clear();
+        break;
+
+    case FileAction::eFileActionClose:
+        if (info->GetFD() == -1)
+            error.SetErrorString("invalid fd for posix_spawn_file_actions_addclose(...)");
+        else
+        {
+            error.SetError(::posix_spawn_file_actions_addclose(file_actions, info->GetFD()), eErrorTypePOSIX);
+            if (log && (error.Fail() || log))
+                error.PutToLog(log, "posix_spawn_file_actions_addclose (action=%p, fd=%i)",
+                               static_cast<void *>(file_actions), info->GetFD());
+        }
+        break;
+
+    case FileAction::eFileActionDuplicate:
+        if (info->GetFD() == -1)
+            error.SetErrorString("invalid fd for posix_spawn_file_actions_adddup2(...)");
+        else if (info->GetActionArgument() == -1)
+            error.SetErrorString("invalid duplicate fd for posix_spawn_file_actions_adddup2(...)");
+        else
+        {
+            error.SetError(::posix_spawn_file_actions_adddup2(file_actions, info->GetFD(), info->GetActionArgument()),
+                           eErrorTypePOSIX);
+            if (log && (error.Fail() || log))
+                error.PutToLog(log, "posix_spawn_file_actions_adddup2 (action=%p, fd=%i, dup_fd=%i)",
+                               static_cast<void *>(file_actions), info->GetFD(), info->GetActionArgument());
+        }
+        break;
+
+    case FileAction::eFileActionOpen:
+        if (info->GetFD() == -1)
+            error.SetErrorString("invalid fd in posix_spawn_file_actions_addopen(...)");
+        else
+        {
+            int oflag = info->GetActionArgument();
+
+            mode_t mode = 0;
+
+            if (oflag & O_CREAT)
+                mode = 0640;
+
+            error.SetError(
+                ::posix_spawn_file_actions_addopen(file_actions, info->GetFD(), info->GetPath(), oflag, mode),
+                eErrorTypePOSIX);
+            if (error.Fail() || log)
+                error.PutToLog(log, "posix_spawn_file_actions_addopen (action=%p, fd=%i, path='%s', oflag=%i, mode=%i)",
+                               static_cast<void *>(file_actions), info->GetFD(), info->GetPath(), oflag, mode);
+        }
+        break;
+    }
+    return error.Success();
+}
+
 #endif // LaunchProcedssPosixSpawn: Apple, Linux, FreeBSD and other GLIBC systems
 
 
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__) || defined(__NetBSD__)
 // The functions below implement process launching via posix_spawn() for Linux,
 // FreeBSD and NetBSD.
 
 Error

lldb/trunk/source/Host/macosx/Host.mm

xpc_connection_resume (conn);
     }
     
     PackageXPCArguments(message, LauncherXPCServiceArgPrefxKey, launch_info.GetArguments());
     PackageXPCArguments(message, LauncherXPCServiceEnvPrefxKey, launch_info.GetEnvironmentEntries());
     
     // Posix spawn stuff.
     xpc_dictionary_set_int64(message, LauncherXPCServiceCPUTypeKey, launch_info.GetArchitecture().GetMachOCPUType());
     xpc_dictionary_set_int64(message, LauncherXPCServicePosixspawnFlagsKey, Host::GetPosixspawnFlags(launch_info));
-    const ProcessLaunchInfo::FileAction *file_action = launch_info.GetFileActionForFD(STDIN_FILENO);
+    const FileAction *file_action = launch_info.GetFileActionForFD(STDIN_FILENO);
     if (file_action && file_action->GetPath())
     {
         xpc_dictionary_set_string(message, LauncherXPCServiceStdInPathKeyKey, file_action->GetPath());
     }
     file_action = launch_info.GetFileActionForFD(STDOUT_FILENO);
     if (file_action && file_action->GetPath())
     {
         xpc_dictionary_set_string(message, LauncherXPCServiceStdOutPathKeyKey, file_action->GetPath());

lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp

namespace
     const UnixSignals&
     GetUnixSignals ()
     {
         static process_linux::LinuxSignals signals;
         return signals;
     }
 
     const char *
-    GetFilePath (const lldb_private::ProcessLaunchInfo::FileAction *file_action, const char *default_path)
+    GetFilePath (const lldb_private::FileAction *file_action, const char *default_path)
     {
         const char *pts_name = "/dev/pts/";
         const char *path = NULL;
 
         if (file_action)
         {
-            if (file_action->GetAction () == ProcessLaunchInfo::FileAction::eFileActionOpen)
+            if (file_action->GetAction () == FileAction::eFileActionOpen)
             {
                 path = file_action->GetPath ();
                 // By default the stdio paths passed in will be pseudo-terminal
                 // (/dev/pts). If so, convert to using a different default path
                 // instead to redirect I/O to the debugger console. This should
                 //  also handle user overrides to /dev/null or a different file.
                 if (!path || ::strncmp (path, pts_name, ::strlen (pts_name)) == 0)
                     path = default_path;
if (working_dir)
       FileSpec working_dir_fs (working_dir, true);
       if (!working_dir_fs || working_dir_fs.GetFileType () != FileSpec::eFileTypeDirectory)
       {
           error.SetErrorStringWithFormat ("No such file or directory: %s", working_dir);
           return error;
       }
     }
 
-    const lldb_private::ProcessLaunchInfo::FileAction *file_action;
+    const lldb_private::FileAction *file_action;
 
     // Default of NULL will mean to use existing open file descriptors.
     const char *stdin_path = NULL;
     const char *stdout_path = NULL;
     const char *stderr_path = NULL;
 
     file_action = launch_info.GetFileActionForFD (STDIN_FILENO);
     stdin_path = GetFilePath (file_action, stdin_path);

lldb/trunk/source/Plugins/Process/POSIX/ProcessPOSIX.h

public:
 
     ProcessMonitor &
     GetMonitor() { assert(m_monitor); return *m_monitor; }
 
     lldb_private::UnixSignals &
     GetUnixSignals();
 
     const char *
-    GetFilePath(const lldb_private::ProcessLaunchInfo::FileAction *file_action,
+    GetFilePath(const lldb_private::FileAction *file_action,
                 const char *default_path);
 
     /// Stops all threads in the process.
     /// The \p stop_tid parameter indicates the thread which initiated the stop.
     virtual void
     StopAllThreads(lldb::tid_t stop_tid);
 
     /// Adds the thread to the list of threads for which we have received the initial stopping signal.

lldb/trunk/source/Plugins/Process/POSIX/ProcessPOSIX.cpp

 ProcessPOSIX::WillLaunch(Module* module)
 {
     Error error;
     return error;
 }
 
 const char *
 ProcessPOSIX::GetFilePath(
-    const lldb_private::ProcessLaunchInfo::FileAction *file_action,
+    const lldb_private::FileAction *file_action,
     const char *default_path)
 {
     const char *pts_name = "/dev/pts/";
     const char *path = NULL;
 
     if (file_action)
     {
-        if (file_action->GetAction () == ProcessLaunchInfo::FileAction::eFileActionOpen)
+        if (file_action->GetAction () == FileAction::eFileActionOpen)
         {
             path = file_action->GetPath();
             // By default the stdio paths passed in will be pseudo-terminal
             // (/dev/pts). If so, convert to using a different default path
             // instead to redirect I/O to the debugger console. This should
             //  also handle user overrides to /dev/null or a different file.
             if (!path || ::strncmp(path, pts_name, ::strlen(pts_name)) == 0)
                 path = default_path;
if (working_dir) {
       {
           error.SetErrorStringWithFormat("No such file or directory: %s", working_dir);
           return error;
       }
     }
 
     SetPrivateState(eStateLaunching);
 
-    const lldb_private::ProcessLaunchInfo::FileAction *file_action;
+    const lldb_private::FileAction *file_action;
 
     // Default of NULL will mean to use existing open file descriptors
     const char *stdin_path = NULL;
     const char *stdout_path = NULL;
     const char *stderr_path = NULL;
 
     file_action = launch_info.GetFileActionForFD (STDIN_FILENO);
     stdin_path = GetFilePath(file_action, stdin_path);

lldb/trunk/source/Plugins/Process/Windows/ProcessWindows.cpp

 // C++ Includes
 // Other libraries and framework includes
 #include "lldb/Core/Module.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/State.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Target/DynamicLoader.h"
+#include "lldb/Target/FileAction.h"
 #include "lldb/Target/Target.h"
 
 #include "ProcessWindows.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
 namespace
 {
 HANDLE
 GetStdioHandle(ProcessLaunchInfo &launch_info, int fd)
 {
-    const ProcessLaunchInfo::FileAction *action = launch_info.GetFileActionForFD(fd);
+    const FileAction *action = launch_info.GetFileActionForFD(fd);
     if (action == nullptr)
         return NULL;
     SECURITY_ATTRIBUTES secattr = {0};
     secattr.nLength = sizeof(SECURITY_ATTRIBUTES);
     secattr.bInheritHandle = TRUE;
 
     const char *path = action->GetPath();
     DWORD access = 0;

lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

 #include "lldb/Core/Log.h"
 #include "lldb/Core/State.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Host/Debug.h"
 #include "lldb/Host/Endian.h"
 #include "lldb/Host/File.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/TimeValue.h"
+#include "lldb/Target/FileAction.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/NativeRegisterContext.h"
 #include "Host/common/NativeProcessProtocol.h"
 #include "Host/common/NativeThreadProtocol.h"
 
 // Project includes
 #include "Utility/StringExtractorGDBRemote.h"
else
         }
     }
 }
 
 GDBRemoteCommunication::PacketResult
 GDBRemoteCommunicationServer::Handle_QSetSTDIN (StringExtractorGDBRemote &packet)
 {
     packet.SetFilePos(::strlen ("QSetSTDIN:"));
-    ProcessLaunchInfo::FileAction file_action;
+    FileAction file_action;
     std::string path;
     packet.GetHexByteString(path);
     const bool read = false;
     const bool write = true;
     if (file_action.Open(STDIN_FILENO, path.c_str(), read, write))
     {
         m_process_launch_info.AppendFileAction(file_action);
         return SendOKResponse ();
     }
     return SendErrorResponse (15);
 }
 
 GDBRemoteCommunication::PacketResult
 GDBRemoteCommunicationServer::Handle_QSetSTDOUT (StringExtractorGDBRemote &packet)
 {
     packet.SetFilePos(::strlen ("QSetSTDOUT:"));
-    ProcessLaunchInfo::FileAction file_action;
+    FileAction file_action;
     std::string path;
     packet.GetHexByteString(path);
     const bool read = true;
     const bool write = false;
     if (file_action.Open(STDOUT_FILENO, path.c_str(), read, write))
     {
         m_process_launch_info.AppendFileAction(file_action);
         return SendOKResponse ();
     }
     return SendErrorResponse (16);
 }
 
 GDBRemoteCommunication::PacketResult
 GDBRemoteCommunicationServer::Handle_QSetSTDERR (StringExtractorGDBRemote &packet)
 {
     packet.SetFilePos(::strlen ("QSetSTDERR:"));
-    ProcessLaunchInfo::FileAction file_action;
+    FileAction file_action;
     std::string path;
     packet.GetHexByteString(path);
     const bool read = true;
     const bool write = false;
     if (file_action.Open(STDERR_FILENO, path.c_str(), read, write))
     {
         m_process_launch_info.AppendFileAction(file_action);
         return SendOKResponse ();

lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

ProcessGDBRemote::DoLaunch (Module *exe_module, ProcessLaunchInfo &launch_info)
     Error error;
 
     uint32_t launch_flags = launch_info.GetFlags().Get();
     const char *stdin_path = NULL;
     const char *stdout_path = NULL;
     const char *stderr_path = NULL;
     const char *working_dir = launch_info.GetWorkingDirectory();
 
-    const ProcessLaunchInfo::FileAction *file_action;
+    const FileAction *file_action;
     file_action = launch_info.GetFileActionForFD (STDIN_FILENO);
     if (file_action)
     {
-        if (file_action->GetAction () == ProcessLaunchInfo::FileAction::eFileActionOpen)
+        if (file_action->GetAction () == FileAction::eFileActionOpen)
             stdin_path = file_action->GetPath();
     }
     file_action = launch_info.GetFileActionForFD (STDOUT_FILENO);
     if (file_action)
     {
-        if (file_action->GetAction () == ProcessLaunchInfo::FileAction::eFileActionOpen)
+        if (file_action->GetAction () == FileAction::eFileActionOpen)
             stdout_path = file_action->GetPath();
     }
     file_action = launch_info.GetFileActionForFD (STDERR_FILENO);
     if (file_action)
     {
-        if (file_action->GetAction () == ProcessLaunchInfo::FileAction::eFileActionOpen)
+        if (file_action->GetAction () == FileAction::eFileActionOpen)
             stderr_path = file_action->GetPath();
     }
 
     //  ::LogSetBitMask (GDBR_LOG_DEFAULT);
     //  ::LogSetOptions (LLDB_LOG_OPTION_THREADSAFE | LLDB_LOG_OPTION_PREPEND_TIMESTAMP | LLDB_LOG_OPTION_PREPEND_PROC_AND_THREAD);
     //  ::LogSetLogFile ("/dev/stdout");
     Log *log (ProcessGDBRemoteLog::GetLogIfAllCategoriesSet (GDBR_LOG_PROCESS));
 

lldb/trunk/source/Target/CMakeLists.txt

 set(LLVM_NO_RTTI 1)
 
 include_directories(../Plugins/Process/Utility)
 
 add_lldb_library(lldbTarget
   ABI.cpp
   CPPLanguageRuntime.cpp
   ExecutionContext.cpp
+  FileAction.cpp
   JITLoader.cpp
   JITLoaderList.cpp
   LanguageRuntime.cpp
   Memory.cpp
   NativeRegisterContext.cpp
   NativeRegisterContextRegisterInfo.cpp
   ObjCLanguageRuntime.cpp
   OperatingSystem.cpp

lldb/trunk/source/Target/FileAction.cpp

+//===-- FileAction.cpp ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <fcntl.h>
+
+#if defined(_WIN32)
+#include "lldb/Host/Windows/win32.h" // For O_NOCTTY
+#endif
+
+#include "lldb/Target/FileAction.h"
+
+using namespace lldb_private;
+
+//----------------------------------------------------------------------------
+// FileAction member functions
+//----------------------------------------------------------------------------
+
+FileAction::FileAction() : m_action(eFileActionNone), m_fd(-1), m_arg(-1), m_path() {}
+
+void FileAction::Clear()
+{
+    m_action = eFileActionNone;
+    m_fd = -1;
+    m_arg = -1;
+    m_path.clear();
+}
+
+const char *FileAction::GetPath() const
+{
+    if (m_path.empty())
+        return NULL;
+    return m_path.c_str();
+}
+
+bool FileAction::Open(int fd, const char *path, bool read, bool write)
+{
+    if ((read || write) && fd >= 0 && path && path[0])
+    {
+        m_action = eFileActionOpen;
+        m_fd = fd;
+        if (read && write)
+            m_arg = O_NOCTTY | O_CREAT | O_RDWR;
+        else if (read)
+            m_arg = O_NOCTTY | O_RDONLY;
+        else
+            m_arg = O_NOCTTY | O_CREAT | O_WRONLY;
+        m_path.assign(path);
+        return true;
+    }
+    else
+    {
+        Clear();
+    }
+    return false;
+}
+
+bool FileAction::Close(int fd)
+{
+    Clear();
+    if (fd >= 0)
+    {
+        m_action = eFileActionClose;
+        m_fd = fd;
+    }
+    return m_fd >= 0;
+}
+
+bool FileAction::Duplicate(int fd, int dup_fd)
+{
+    Clear();
+    if (fd >= 0 && dup_fd >= 0)
+    {
+        m_action = eFileActionDuplicate;
+        m_fd = fd;
+        m_arg = dup_fd;
+    }
+    return m_fd >= 0;
+}

lldb/trunk/source/Target/Process.cpp

ProcessLaunchCommandOptions::SetOptionValue (uint32_t option_idx, const char *option_arg)
     switch (short_option)
     {
         case 's':   // Stop at program entry point
             launch_info.GetFlags().Set (eLaunchFlagStopAtEntry); 
             break;
             
         case 'i':   // STDIN for read only
             {   
-                ProcessLaunchInfo::FileAction action;
+                FileAction action;
                 if (action.Open (STDIN_FILENO, option_arg, true, false))
                     launch_info.AppendFileAction (action);
             }
             break;
             
         case 'o':   // Open STDOUT for write only
             {   
-                ProcessLaunchInfo::FileAction action;
+                FileAction action;
                 if (action.Open (STDOUT_FILENO, option_arg, false, true))
                     launch_info.AppendFileAction (action);
             }
             break;
 
         case 'e':   // STDERR for write only
             {   
-                ProcessLaunchInfo::FileAction action;
+                FileAction action;
                 if (action.Open (STDERR_FILENO, option_arg, false, true))
                     launch_info.AppendFileAction (action);
             }
             break;
             
 
         case 'p':   // Process plug-in name
             launch_info.SetProcessPluginName (option_arg);    
             break;
             
         case 'n':   // Disable STDIO
             {
-                ProcessLaunchInfo::FileAction action;
+                FileAction action;
                 if (action.Open (STDIN_FILENO, "/dev/null", true, false))
                     launch_info.AppendFileAction (action);
                 if (action.Open (STDOUT_FILENO, "/dev/null", false, true))
                     launch_info.AppendFileAction (action);
                 if (action.Open (STDERR_FILENO, "/dev/null", false, true))
                     launch_info.AppendFileAction (action);
             }
             break;

lldb/trunk/source/Target/ProcessLaunchInfo.cpp

 //===-- ProcessLaunchInfo.cpp -----------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/Config.h"
 
-#include "lldb/Target/ProcessLaunchInfo.h"
-
 #ifndef LLDB_DISABLE_POSIX
 #include <spawn.h>
 #endif
 
+#include "lldb/Target/ProcessLaunchInfo.h"
+#include "lldb/Target/FileAction.h"
 #include "lldb/Target/Target.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
 //----------------------------------------------------------------------------
-// ProcessLaunchInfo::FileAction member functions
-//----------------------------------------------------------------------------
-
-ProcessLaunchInfo::FileAction::FileAction () :
-    m_action (eFileActionNone),
-    m_fd (-1),
-    m_arg (-1),
-    m_path ()
-{
-}
-
-void
-ProcessLaunchInfo::FileAction::Clear()
-{
-    m_action = eFileActionNone;
-    m_fd = -1;
-    m_arg = -1;
-    m_path.clear();
-}
-
-const char *
-ProcessLaunchInfo::FileAction::GetPath () const
-{
-    if (m_path.empty())
-        return NULL;
-    return m_path.c_str();
-}
-
-//----------------------------------------------------------------------------
 // ProcessLaunchInfo member functions
 //----------------------------------------------------------------------------
 
 ProcessLaunchInfo::ProcessLaunchInfo () :
     ProcessInfo(),
     m_working_dir (),
     m_plugin_name (),
     m_shell (),
     m_flags (0),
     m_file_actions (),
     m_pty (),
     m_resume_count (0),
     m_monitor_callback (NULL),
     m_monitor_callback_baton (NULL),
     m_monitor_signals (false),
     m_hijack_listener_sp ()
 {
 }
 
-ProcessLaunchInfo::ProcessLaunchInfo (
-                                      const char *stdin_path,
+ProcessLaunchInfo::ProcessLaunchInfo (const char *stdin_path,
                                       const char *stdout_path,
                                       const char *stderr_path,
                                       const char *working_directory,
                                       uint32_t launch_flags) :
     ProcessInfo(),
     m_working_dir (),
     m_plugin_name (),
     m_shell (),
     m_flags (launch_flags),
     m_file_actions (),
     m_pty (),
     m_resume_count (0),
     m_monitor_callback (NULL),
     m_monitor_callback_baton (NULL),
     m_monitor_signals (false),
     m_hijack_listener_sp ()
 {
     if (stdin_path)
     {
-        ProcessLaunchInfo::FileAction file_action;
+        FileAction file_action;
         const bool read = true;
         const bool write = false;
         if (file_action.Open(STDIN_FILENO, stdin_path, read, write))
             AppendFileAction (file_action);
     }
     if (stdout_path)
     {
-        ProcessLaunchInfo::FileAction file_action;
+        FileAction file_action;
         const bool read = false;
         const bool write = true;
         if (file_action.Open(STDOUT_FILENO, stdout_path, read, write))
             AppendFileAction (file_action);
     }
     if (stderr_path)
     {
-        ProcessLaunchInfo::FileAction file_action;
+        FileAction file_action;
         const bool read = false;
         const bool write = true;
         if (file_action.Open(STDERR_FILENO, stderr_path, read, write))
             AppendFileAction (file_action);
     }
     if (working_directory)
         SetWorkingDirectory(working_directory);
 }
ProcessLaunchInfo::AppendSuppressFileAction (int fd, bool read, bool write)
     if (file_action.Open (fd, "/dev/null", read, write))
     {
         AppendFileAction (file_action);
         return true;
     }
     return false;
 }
 
-const ProcessLaunchInfo::FileAction *
+const FileAction *
 ProcessLaunchInfo::GetFileActionAtIndex (size_t idx) const
 {
     if (idx < m_file_actions.size())
         return &m_file_actions[idx];
     return NULL;
 }
 
-const ProcessLaunchInfo::FileAction *
+const FileAction *
 ProcessLaunchInfo::GetFileActionForFD (int fd) const
 {
     for (size_t idx=0, count=m_file_actions.size(); idx < count; ++idx)
     {
         if (m_file_actions[idx].GetFD () == fd)
             return &m_file_actions[idx];
     }
     return NULL;
if (GetFlags().Test (eLaunchFlagLaunchInShell))
         }
     }
     else
     {
         error.SetErrorString ("not launching in shell");
     }
     return false;
 }
-
-
-bool
-ProcessLaunchInfo::FileAction::Open (int fd, const char *path, bool read, bool write)
-{
-    if ((read || write) && fd >= 0 && path && path[0])
-    {
-        m_action = eFileActionOpen;
-        m_fd = fd;
-        if (read && write)
-            m_arg = O_NOCTTY | O_CREAT | O_RDWR;
-        else if (read)
-            m_arg = O_NOCTTY | O_RDONLY;
-        else
-            m_arg = O_NOCTTY | O_CREAT | O_WRONLY;
-        m_path.assign (path);
-        return true;
-    }
-    else
-    {
-        Clear();
-    }
-    return false;
-}
-
-bool
-ProcessLaunchInfo::FileAction::Close (int fd)
-{
-    Clear();
-    if (fd >= 0)
-    {
-        m_action = eFileActionClose;
-        m_fd = fd;
-    }
-    return m_fd >= 0;
-}
-
-
-bool
-ProcessLaunchInfo::FileAction::Duplicate (int fd, int dup_fd)
-{
-    Clear();
-    if (fd >= 0 && dup_fd >= 0)
-    {
-        m_action = eFileActionDuplicate;
-        m_fd = fd;
-        m_arg = dup_fd;
-    }
-    return m_fd >= 0;
-}
-
-
-
-#ifndef LLDB_DISABLE_POSIX
-bool
-ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (void *_file_actions,
-                                                        const FileAction *info,
-                                                        Log *log,
-                                                        Error& error)
-{
-    if (info == NULL)
-        return false;
-
-    posix_spawn_file_actions_t *file_actions = reinterpret_cast<posix_spawn_file_actions_t *>(_file_actions);
-
-    switch (info->m_action)
-    {
-        case eFileActionNone:
-            error.Clear();
-            break;
-
-        case eFileActionClose:
-            if (info->m_fd == -1)
-                error.SetErrorString ("invalid fd for posix_spawn_file_actions_addclose(...)");
-            else
-            {
-                error.SetError (::posix_spawn_file_actions_addclose (file_actions, info->m_fd),
-                                eErrorTypePOSIX);
-                if (log && (error.Fail() || log))
-                    error.PutToLog(log, "posix_spawn_file_actions_addclose (action=%p, fd=%i)",
-                                   static_cast<void*>(file_actions), info->m_fd);
-            }
-            break;
-
-        case eFileActionDuplicate:
-            if (info->m_fd == -1)
-                error.SetErrorString ("invalid fd for posix_spawn_file_actions_adddup2(...)");
-            else if (info->m_arg == -1)
-                error.SetErrorString ("invalid duplicate fd for posix_spawn_file_actions_adddup2(...)");
-            else
-            {
-                error.SetError (::posix_spawn_file_actions_adddup2 (file_actions, info->m_fd, info->m_arg),
-                                eErrorTypePOSIX);
-                if (log && (error.Fail() || log))
-                    error.PutToLog(log, "posix_spawn_file_actions_adddup2 (action=%p, fd=%i, dup_fd=%i)",
-                                   static_cast<void*>(file_actions), info->m_fd,
-                                   info->m_arg);
-            }
-            break;
-
-        case eFileActionOpen:
-            if (info->m_fd == -1)
-                error.SetErrorString ("invalid fd in posix_spawn_file_actions_addopen(...)");
-            else
-            {
-                int oflag = info->m_arg;
-
-                mode_t mode = 0;
-
-                if (oflag & O_CREAT)
-                    mode = 0640;
-
-                error.SetError (::posix_spawn_file_actions_addopen (file_actions,
-                                                                    info->m_fd,
-                                                                    info->m_path.c_str(),
-                                                                    oflag,
-                                                                    mode),
-                                eErrorTypePOSIX);
-                if (error.Fail() || log)
-                    error.PutToLog(log,
-                                   "posix_spawn_file_actions_addopen (action=%p, fd=%i, path='%s', oflag=%i, mode=%i)",
-                                   static_cast<void*>(file_actions), info->m_fd,
-                                   info->m_path.c_str(), oflag, mode);
-            }
-            break;
-    }
-    return error.Success();
-}
-#endif