2010-06-09 00:52:24 +08:00
|
|
|
//===-- Host.mm -------------------------------------------------*- C++ -*-===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2010-09-08 04:11:56 +08:00
|
|
|
#include "lldb/Host/Host.h"
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
|
2010-12-04 08:10:17 +08:00
|
|
|
#include <crt_externs.h>
|
2010-12-03 14:02:24 +08:00
|
|
|
#include <execinfo.h>
|
2010-10-20 02:15:50 +08:00
|
|
|
#include <libproc.h>
|
2010-12-03 14:02:24 +08:00
|
|
|
#include <stdio.h>
|
2010-10-20 02:15:50 +08:00
|
|
|
#include <sys/proc.h>
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
#include <sys/stat.h>
|
2010-10-20 02:15:50 +08:00
|
|
|
#include <sys/types.h>
|
2010-12-03 14:02:24 +08:00
|
|
|
#include <unistd.h>
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
|
|
|
|
#include "lldb/Core/ArchSpec.h"
|
2010-10-19 11:25:40 +08:00
|
|
|
#include "lldb/Core/Communication.h"
|
|
|
|
#include "lldb/Core/ConnectionFileDescriptor.h"
|
2011-02-08 13:05:52 +08:00
|
|
|
#include "lldb/Host/FileSpec.h"
|
2010-09-08 04:11:56 +08:00
|
|
|
#include "lldb/Core/Log.h"
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
#include "lldb/Core/StreamFile.h"
|
|
|
|
#include "lldb/Core/StreamString.h"
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2010-07-10 04:39:50 +08:00
|
|
|
#include "cfcpp/CFCBundle.h"
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
#include "cfcpp/CFCMutableArray.h"
|
2010-10-01 05:49:03 +08:00
|
|
|
#include "cfcpp/CFCMutableDictionary.h"
|
2010-07-10 04:39:50 +08:00
|
|
|
#include "cfcpp/CFCReleaser.h"
|
|
|
|
#include "cfcpp/CFCString.h"
|
2010-06-09 00:52:24 +08:00
|
|
|
|
2010-09-08 04:11:56 +08:00
|
|
|
#include <objc/objc-auto.h>
|
|
|
|
|
2010-10-01 05:49:03 +08:00
|
|
|
#include <ApplicationServices/ApplicationServices.h>
|
2010-09-08 04:11:56 +08:00
|
|
|
#include <Carbon/Carbon.h>
|
|
|
|
#include <Foundation/Foundation.h>
|
2010-06-09 00:52:24 +08:00
|
|
|
|
|
|
|
using namespace lldb;
|
|
|
|
using namespace lldb_private;
|
|
|
|
|
|
|
|
class MacOSXDarwinThread
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
MacOSXDarwinThread(const char *thread_name) :
|
|
|
|
m_pool (nil)
|
|
|
|
{
|
|
|
|
// Register our thread with the collector if garbage collection is enabled.
|
|
|
|
if (objc_collectingEnabled())
|
|
|
|
{
|
|
|
|
#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5
|
|
|
|
// On Leopard and earlier there is no way objc_registerThreadWithCollector
|
|
|
|
// function, so we do it manually.
|
|
|
|
auto_zone_register_thread(auto_zone());
|
|
|
|
#else
|
2011-01-09 04:28:42 +08:00
|
|
|
// On SnowLeopard and later we just call the thread registration function.
|
2010-06-09 00:52:24 +08:00
|
|
|
objc_registerThreadWithCollector();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
m_pool = [[NSAutoreleasePool alloc] init];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Host::SetThreadName (LLDB_INVALID_PROCESS_ID, LLDB_INVALID_THREAD_ID, thread_name);
|
|
|
|
}
|
|
|
|
|
|
|
|
~MacOSXDarwinThread()
|
|
|
|
{
|
|
|
|
if (m_pool)
|
|
|
|
[m_pool release];
|
|
|
|
}
|
|
|
|
|
|
|
|
static void PThreadDestructor (void *v)
|
|
|
|
{
|
|
|
|
delete (MacOSXDarwinThread*)v;
|
|
|
|
}
|
|
|
|
|
|
|
|
protected:
|
|
|
|
NSAutoreleasePool * m_pool;
|
|
|
|
private:
|
|
|
|
DISALLOW_COPY_AND_ASSIGN (MacOSXDarwinThread);
|
|
|
|
};
|
|
|
|
|
|
|
|
static pthread_once_t g_thread_create_once = PTHREAD_ONCE_INIT;
|
|
|
|
static pthread_key_t g_thread_create_key = 0;
|
|
|
|
|
|
|
|
static void
|
|
|
|
InitThreadCreated()
|
|
|
|
{
|
|
|
|
::pthread_key_create (&g_thread_create_key, MacOSXDarwinThread::PThreadDestructor);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Host::ThreadCreated (const char *thread_name)
|
|
|
|
{
|
|
|
|
::pthread_once (&g_thread_create_once, InitThreadCreated);
|
|
|
|
if (g_thread_create_key)
|
|
|
|
{
|
|
|
|
::pthread_setspecific (g_thread_create_key, new MacOSXDarwinThread(thread_name));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
Host::ResolveExecutableInBundle (FileSpec &file)
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
2010-09-08 04:11:56 +08:00
|
|
|
#if defined (__APPLE__)
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
if (file.GetFileType () == FileSpec::eFileTypeDirectory)
|
2010-09-08 04:11:56 +08:00
|
|
|
{
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
char path[PATH_MAX];
|
|
|
|
if (file.GetPath(path, sizeof(path)))
|
2010-06-09 00:52:24 +08:00
|
|
|
{
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
CFCBundle bundle (path);
|
|
|
|
CFCReleaser<CFURLRef> url(bundle.CopyExecutableURL ());
|
|
|
|
if (url.get())
|
|
|
|
{
|
|
|
|
if (::CFURLGetFileSystemRepresentation (url.get(), YES, (UInt8*)path, sizeof(path)))
|
|
|
|
{
|
2010-10-21 04:54:39 +08:00
|
|
|
file.SetFile(path, false);
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2010-06-09 00:52:24 +08:00
|
|
|
}
|
|
|
|
}
|
2010-09-08 04:11:56 +08:00
|
|
|
#endif
|
|
|
|
return false;
|
2010-08-10 07:31:02 +08:00
|
|
|
}
|
2010-08-31 03:44:40 +08:00
|
|
|
|
2010-10-01 05:49:03 +08:00
|
|
|
lldb::pid_t
|
|
|
|
Host::LaunchApplication (const FileSpec &app_file_spec)
|
|
|
|
{
|
|
|
|
char app_path[PATH_MAX];
|
|
|
|
app_file_spec.GetPath(app_path, sizeof(app_path));
|
|
|
|
|
|
|
|
LSApplicationParameters app_params;
|
2011-02-05 05:13:05 +08:00
|
|
|
::memset (&app_params, 0, sizeof (app_params));
|
2010-10-01 05:49:03 +08:00
|
|
|
app_params.flags = kLSLaunchDefaults |
|
|
|
|
kLSLaunchDontAddToRecents |
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
kLSLaunchNewInstance;
|
|
|
|
|
2010-10-01 05:49:03 +08:00
|
|
|
|
|
|
|
FSRef app_fsref;
|
|
|
|
CFCString app_cfstr (app_path, kCFStringEncodingUTF8);
|
|
|
|
|
2010-11-11 04:16:47 +08:00
|
|
|
OSStatus error = ::FSPathMakeRef ((const UInt8 *)app_path, &app_fsref, NULL);
|
2010-10-01 05:49:03 +08:00
|
|
|
|
|
|
|
// If we found the app, then store away the name so we don't have to re-look it up.
|
|
|
|
if (error != noErr)
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
app_params.application = &app_fsref;
|
|
|
|
|
|
|
|
ProcessSerialNumber psn;
|
|
|
|
|
|
|
|
error = ::LSOpenApplication (&app_params, &psn);
|
|
|
|
|
|
|
|
if (error != noErr)
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
|
|
|
|
::pid_t pid = LLDB_INVALID_PROCESS_ID;
|
|
|
|
error = ::GetProcessPID(&psn, &pid);
|
|
|
|
return pid;
|
|
|
|
}
|
2010-10-20 01:03:58 +08:00
|
|
|
|
|
|
|
|
2010-10-20 02:15:50 +08:00
|
|
|
static void *
|
|
|
|
AcceptPIDFromInferior (void *arg)
|
|
|
|
{
|
|
|
|
const char *connect_url = (const char *)arg;
|
2010-10-20 01:03:58 +08:00
|
|
|
ConnectionFileDescriptor file_conn;
|
2010-10-20 02:15:50 +08:00
|
|
|
Error error;
|
|
|
|
if (file_conn.Connect (connect_url, &error) == eConnectionStatusSuccess)
|
2010-10-20 01:03:58 +08:00
|
|
|
{
|
|
|
|
char pid_str[256];
|
2011-02-05 05:13:05 +08:00
|
|
|
::memset (pid_str, 0, sizeof(pid_str));
|
2010-10-20 01:03:58 +08:00
|
|
|
ConnectionStatus status;
|
|
|
|
const size_t pid_str_len = file_conn.Read (pid_str, sizeof(pid_str), status, NULL);
|
|
|
|
if (pid_str_len > 0)
|
|
|
|
{
|
2010-10-20 02:15:50 +08:00
|
|
|
int pid = atoi (pid_str);
|
|
|
|
return (void *)(intptr_t)pid;
|
2010-10-20 01:03:58 +08:00
|
|
|
}
|
|
|
|
}
|
2010-10-20 02:15:50 +08:00
|
|
|
return NULL;
|
2010-10-20 01:03:58 +08:00
|
|
|
}
|
|
|
|
|
2010-10-20 02:15:50 +08:00
|
|
|
static bool
|
|
|
|
WaitForProcessToSIGSTOP (const lldb::pid_t pid, const int timeout_in_seconds)
|
|
|
|
{
|
|
|
|
const int time_delta_usecs = 100000;
|
|
|
|
const int num_retries = timeout_in_seconds/time_delta_usecs;
|
|
|
|
for (int i=0; i<num_retries; i++)
|
|
|
|
{
|
|
|
|
struct proc_bsdinfo bsd_info;
|
|
|
|
int error = ::proc_pidinfo (pid, PROC_PIDTBSDINFO,
|
|
|
|
(uint64_t) 0,
|
|
|
|
&bsd_info,
|
|
|
|
PROC_PIDTBSDINFO_SIZE);
|
|
|
|
|
|
|
|
switch (error)
|
|
|
|
{
|
|
|
|
case EINVAL:
|
|
|
|
case ENOTSUP:
|
|
|
|
case ESRCH:
|
|
|
|
case EPERM:
|
|
|
|
return false;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0:
|
|
|
|
if (bsd_info.pbi_status == SSTOP)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
::usleep (time_delta_usecs);
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static lldb::pid_t
|
|
|
|
LaunchInNewTerminalWithCommandFile
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
(
|
|
|
|
const char **argv,
|
|
|
|
const char **envp,
|
Added a new variant of SBTarget::Launch() that deprectates the old one that
takes separate file handles for stdin, stdout, and stder and also allows for
the working directory to be specified.
Added support to "process launch" to a new option: --working-dir=PATH. We
can now set the working directory. If this is not set, it defaults to that
of the process that has LLDB loaded. Added the working directory to the
host LaunchInNewTerminal function to allows the current working directory
to be set in processes that are spawned in their own terminal. Also hooked this
up to the lldb_private::Process and all mac plug-ins. The linux plug-in had its
API changed, but nothing is making use of it yet. Modfied "debugserver" and
"darwin-debug" to also handle the current working directory options and modified
the code in LLDB that spawns these tools to pass the info along.
Fixed ProcessGDBRemote to properly pass along all file handles for stdin, stdout
and stderr.
After clearing the default values for the stdin/out/err file handles for
process to be NULL, we had a crasher in UserSettingsController::UpdateStringVariable
which is now fixed. Also fixed the setting of boolean values to be able to
be set as "true", "yes", "on", "1" for true (case insensitive) and "false", "no",
"off", or "0" for false.
Fixed debugserver to properly handle files for STDIN, STDOUT and STDERR that are not
already opened. Previous to this fix debugserver would only correctly open and dupe
file handles for the slave side of a pseudo terminal. It now correctly handles
getting STDIN for the inferior from a file, and spitting STDOUT and STDERR out to
files. Also made sure the file handles were correctly opened with the NOCTTY flag
for terminals.
llvm-svn: 124060
2011-01-23 13:56:20 +08:00
|
|
|
const char *working_dir,
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
const ArchSpec *arch_spec,
|
|
|
|
bool stop_at_entry,
|
|
|
|
bool disable_aslr
|
|
|
|
)
|
|
|
|
{
|
|
|
|
if (!argv || !argv[0])
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
OSStatus error = 0;
|
|
|
|
|
2010-10-21 04:54:39 +08:00
|
|
|
FileSpec program (argv[0], false);
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
|
|
|
|
|
2010-10-19 11:25:40 +08:00
|
|
|
std::string unix_socket_name;
|
|
|
|
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
char temp_file_path[PATH_MAX];
|
|
|
|
const char *tmpdir = ::getenv ("TMPDIR");
|
|
|
|
if (tmpdir == NULL)
|
|
|
|
tmpdir = "/tmp/";
|
|
|
|
::snprintf (temp_file_path, sizeof(temp_file_path), "%s%s-XXXXXX", tmpdir, program.GetFilename().AsCString());
|
|
|
|
|
|
|
|
if (::mktemp (temp_file_path) == NULL)
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
2010-10-19 11:25:40 +08:00
|
|
|
unix_socket_name.assign (temp_file_path);
|
|
|
|
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
::strncat (temp_file_path, ".command", sizeof (temp_file_path));
|
|
|
|
|
2011-02-09 09:08:52 +08:00
|
|
|
StreamFile command_file;
|
|
|
|
command_file.GetFile().Open (temp_file_path,
|
|
|
|
File::eOpenOptionWrite | File::eOpenOptionCanCreate,
|
|
|
|
File::ePermissionsDefault);
|
|
|
|
|
|
|
|
if (!command_file.GetFile().IsValid())
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
|
|
|
|
FileSpec darwin_debug_file_spec;
|
|
|
|
if (!Host::GetLLDBPath (ePathTypeSupportExecutableDir, darwin_debug_file_spec))
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
darwin_debug_file_spec.GetFilename().SetCString("darwin-debug");
|
|
|
|
|
|
|
|
if (!darwin_debug_file_spec.Exists())
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
char launcher_path[PATH_MAX];
|
|
|
|
darwin_debug_file_spec.GetPath(launcher_path, sizeof(launcher_path));
|
|
|
|
command_file.Printf("\"%s\" ", launcher_path);
|
|
|
|
|
2010-10-19 11:25:40 +08:00
|
|
|
command_file.Printf("--unix-socket=%s ", unix_socket_name.c_str());
|
|
|
|
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
if (arch_spec && arch_spec->IsValid())
|
|
|
|
{
|
2011-02-23 08:35:02 +08:00
|
|
|
command_file.Printf("--arch=%s ", arch_spec->GetArchitectureName());
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (disable_aslr)
|
|
|
|
{
|
|
|
|
command_file.PutCString("--disable-aslr ");
|
|
|
|
}
|
|
|
|
|
|
|
|
command_file.PutCString("-- ");
|
|
|
|
|
|
|
|
if (argv)
|
|
|
|
{
|
|
|
|
for (size_t i=0; argv[i] != NULL; ++i)
|
|
|
|
{
|
|
|
|
command_file.Printf("\"%s\" ", argv[i]);
|
|
|
|
}
|
|
|
|
}
|
2010-10-18 09:45:30 +08:00
|
|
|
command_file.PutCString("\necho Process exited with status $?\n");
|
2011-02-09 09:08:52 +08:00
|
|
|
command_file.GetFile().Close();
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
if (::chmod (temp_file_path, S_IRWXU | S_IRWXG) != 0)
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
CFCMutableDictionary cf_env_dict;
|
|
|
|
|
|
|
|
const bool can_create = true;
|
|
|
|
if (envp)
|
|
|
|
{
|
|
|
|
for (size_t i=0; envp[i] != NULL; ++i)
|
|
|
|
{
|
|
|
|
const char *env_entry = envp[i];
|
|
|
|
const char *equal_pos = strchr(env_entry, '=');
|
|
|
|
if (equal_pos)
|
|
|
|
{
|
|
|
|
std::string env_key (env_entry, equal_pos);
|
|
|
|
std::string env_val (equal_pos + 1);
|
|
|
|
CFCString cf_env_key (env_key.c_str(), kCFStringEncodingUTF8);
|
|
|
|
CFCString cf_env_val (env_val.c_str(), kCFStringEncodingUTF8);
|
|
|
|
cf_env_dict.AddValue (cf_env_key.get(), cf_env_val.get(), can_create);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
LSApplicationParameters app_params;
|
2011-02-05 05:13:05 +08:00
|
|
|
::memset (&app_params, 0, sizeof (app_params));
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
app_params.flags = kLSLaunchDontAddToRecents | kLSLaunchAsync;
|
|
|
|
app_params.argv = NULL;
|
|
|
|
app_params.environment = (CFDictionaryRef)cf_env_dict.get();
|
|
|
|
|
|
|
|
CFCReleaser<CFURLRef> command_file_url (::CFURLCreateFromFileSystemRepresentation (NULL,
|
|
|
|
(const UInt8 *)temp_file_path,
|
2010-10-19 11:25:40 +08:00
|
|
|
strlen(temp_file_path),
|
Added a new Host call to find LLDB related paths:
static bool
Host::GetLLDBPath (lldb::PathType path_type, FileSpec &file_spec);
This will fill in "file_spec" with an appropriate path that is appropriate
for the current Host OS. MacOSX will return paths within the LLDB.framework,
and other unixes will return the paths they want. The current PathType
enums are:
typedef enum PathType
{
ePathTypeLLDBShlibDir, // The directory where the lldb.so (unix) or LLDB mach-o file in LLDB.framework (MacOSX) exists
ePathTypeSupportExecutableDir, // Find LLDB support executable directory (debugserver, etc)
ePathTypeHeaderDir, // Find LLDB header file directory
ePathTypePythonDir // Find Python modules (PYTHONPATH) directory
} PathType;
All places that were finding executables are and python paths are now updated
to use this Host call.
Added another new host call to launch the inferior in a terminal. This ability
will be very host specific and doesn't need to be supported on all systems.
MacOSX currently will create a new .command file and tell Terminal.app to open
the .command file. It also uses the new "darwin-debug" app which is a small
app that uses posix to exec (no fork) and stop at the entry point of the
program. The GDB remote plug-in is almost able launch a process and attach to
it, it currently will spawn the process, but it won't attach to it just yet.
This will let LLDB not have to share the terminal with another process and a
new terminal window will pop up when you launch. This won't get hooked up
until we work out all of the kinks. The new Host function is:
static lldb::pid_t
Host::LaunchInNewTerminal (
const char **argv, // argv[0] is executable
const char **envp,
const ArchSpec *arch_spec,
bool stop_at_entry,
bool disable_aslr);
Cleaned up FileSpec::GetPath to not use strncpy() as it was always zero
filling the entire path buffer.
Fixed an issue with the dynamic checker function where I missed a '$' prefix
that should have been added.
llvm-svn: 116690
2010-10-18 06:03:32 +08:00
|
|
|
false));
|
|
|
|
|
|
|
|
CFCMutableArray urls;
|
|
|
|
|
|
|
|
// Terminal.app will open the ".command" file we have created
|
|
|
|
// and run our process inside it which will wait at the entry point
|
|
|
|
// for us to attach.
|
|
|
|
urls.AppendValue(command_file_url.get());
|
|
|
|
|
|
|
|
|
2010-10-19 11:25:40 +08:00
|
|
|
lldb::pid_t pid = LLDB_INVALID_PROCESS_ID;
|
2010-10-01 05:49:03 +08:00
|
|
|
|
2010-10-19 11:25:40 +08:00
|
|
|
Error lldb_error;
|
|
|
|
// Sleep and wait a bit for debugserver to start to listen...
|
|
|
|
char connect_url[128];
|
|
|
|
::snprintf (connect_url, sizeof(connect_url), "unix-accept://%s", unix_socket_name.c_str());
|
|
|
|
|
2010-10-20 02:15:50 +08:00
|
|
|
// Spawn a new thread to accept incoming connection on the connect_url
|
|
|
|
// so we can grab the pid from the inferior
|
|
|
|
lldb::thread_t accept_thread = Host::ThreadCreate (unix_socket_name.c_str(),
|
|
|
|
AcceptPIDFromInferior,
|
|
|
|
connect_url,
|
|
|
|
&lldb_error);
|
|
|
|
|
2010-10-19 11:25:40 +08:00
|
|
|
ProcessSerialNumber psn;
|
|
|
|
error = LSOpenURLsWithRole(urls.get(), kLSRolesShell, NULL, &app_params, &psn, 1);
|
|
|
|
if (error == noErr)
|
|
|
|
{
|
2010-10-20 02:15:50 +08:00
|
|
|
thread_result_t accept_thread_result = NULL;
|
|
|
|
if (Host::ThreadJoin (accept_thread, &accept_thread_result, &lldb_error))
|
2010-10-19 11:25:40 +08:00
|
|
|
{
|
2010-10-20 02:15:50 +08:00
|
|
|
if (accept_thread_result)
|
2010-10-19 11:25:40 +08:00
|
|
|
{
|
2010-10-20 02:15:50 +08:00
|
|
|
pid = (intptr_t)accept_thread_result;
|
|
|
|
|
|
|
|
// Wait for process to be stopped the the entry point by watching
|
|
|
|
// for the process status to be set to SSTOP which indicates it it
|
|
|
|
// SIGSTOP'ed at the entry point
|
|
|
|
WaitForProcessToSIGSTOP (pid, 5);
|
2010-10-19 11:25:40 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-10-20 02:15:50 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
Host::ThreadCancel (accept_thread, &lldb_error);
|
|
|
|
}
|
|
|
|
|
|
|
|
return pid;
|
|
|
|
}
|
|
|
|
|
2010-10-20 07:16:00 +08:00
|
|
|
const char *applscript_in_new_tty =
|
|
|
|
"tell application \"Terminal\"\n"
|
|
|
|
" do script \"%s\"\n"
|
|
|
|
"end tell\n";
|
|
|
|
|
|
|
|
|
|
|
|
const char *applscript_in_existing_tty = "\
|
|
|
|
set the_shell_script to \"%s\"\n\
|
|
|
|
tell application \"Terminal\"\n\
|
|
|
|
repeat with the_window in (get windows)\n\
|
|
|
|
repeat with the_tab in tabs of the_window\n\
|
|
|
|
set the_tty to tty in the_tab\n\
|
|
|
|
if the_tty contains \"%s\" then\n\
|
|
|
|
if the_tab is not busy then\n\
|
|
|
|
set selected of the_tab to true\n\
|
|
|
|
set frontmost of the_window to true\n\
|
|
|
|
do script the_shell_script in the_tab\n\
|
|
|
|
return\n\
|
|
|
|
end if\n\
|
|
|
|
end if\n\
|
|
|
|
end repeat\n\
|
|
|
|
end repeat\n\
|
|
|
|
do script the_shell_script\n\
|
|
|
|
end tell\n";
|
2010-10-20 02:15:50 +08:00
|
|
|
|
|
|
|
lldb::pid_t
|
|
|
|
LaunchInNewTerminalWithAppleScript
|
|
|
|
(
|
2010-10-20 07:16:00 +08:00
|
|
|
const char *tty_name,
|
2010-10-20 02:15:50 +08:00
|
|
|
const char **argv,
|
|
|
|
const char **envp,
|
Added a new variant of SBTarget::Launch() that deprectates the old one that
takes separate file handles for stdin, stdout, and stder and also allows for
the working directory to be specified.
Added support to "process launch" to a new option: --working-dir=PATH. We
can now set the working directory. If this is not set, it defaults to that
of the process that has LLDB loaded. Added the working directory to the
host LaunchInNewTerminal function to allows the current working directory
to be set in processes that are spawned in their own terminal. Also hooked this
up to the lldb_private::Process and all mac plug-ins. The linux plug-in had its
API changed, but nothing is making use of it yet. Modfied "debugserver" and
"darwin-debug" to also handle the current working directory options and modified
the code in LLDB that spawns these tools to pass the info along.
Fixed ProcessGDBRemote to properly pass along all file handles for stdin, stdout
and stderr.
After clearing the default values for the stdin/out/err file handles for
process to be NULL, we had a crasher in UserSettingsController::UpdateStringVariable
which is now fixed. Also fixed the setting of boolean values to be able to
be set as "true", "yes", "on", "1" for true (case insensitive) and "false", "no",
"off", or "0" for false.
Fixed debugserver to properly handle files for STDIN, STDOUT and STDERR that are not
already opened. Previous to this fix debugserver would only correctly open and dupe
file handles for the slave side of a pseudo terminal. It now correctly handles
getting STDIN for the inferior from a file, and spitting STDOUT and STDERR out to
files. Also made sure the file handles were correctly opened with the NOCTTY flag
for terminals.
llvm-svn: 124060
2011-01-23 13:56:20 +08:00
|
|
|
const char *working_dir,
|
2010-10-20 02:15:50 +08:00
|
|
|
const ArchSpec *arch_spec,
|
|
|
|
bool stop_at_entry,
|
|
|
|
bool disable_aslr
|
|
|
|
)
|
|
|
|
{
|
|
|
|
if (!argv || !argv[0])
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
std::string unix_socket_name;
|
|
|
|
|
|
|
|
char temp_file_path[PATH_MAX] = "/tmp/XXXXXX";
|
|
|
|
if (::mktemp (temp_file_path) == NULL)
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
unix_socket_name.assign (temp_file_path);
|
|
|
|
|
|
|
|
StreamString command;
|
|
|
|
FileSpec darwin_debug_file_spec;
|
|
|
|
if (!Host::GetLLDBPath (ePathTypeSupportExecutableDir, darwin_debug_file_spec))
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
darwin_debug_file_spec.GetFilename().SetCString("darwin-debug");
|
|
|
|
|
|
|
|
if (!darwin_debug_file_spec.Exists())
|
|
|
|
return LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
char launcher_path[PATH_MAX];
|
|
|
|
darwin_debug_file_spec.GetPath(launcher_path, sizeof(launcher_path));
|
2010-10-20 07:16:00 +08:00
|
|
|
|
2010-11-08 11:06:10 +08:00
|
|
|
if (arch_spec)
|
2011-02-23 08:35:02 +08:00
|
|
|
command.Printf("arch -arch %s ", arch_spec->GetArchitectureName());
|
2010-11-08 11:06:10 +08:00
|
|
|
|
2010-10-20 07:16:00 +08:00
|
|
|
command.Printf("'%s' --unix-socket=%s", launcher_path, unix_socket_name.c_str());
|
2010-10-20 02:15:50 +08:00
|
|
|
|
|
|
|
if (arch_spec && arch_spec->IsValid())
|
2011-02-23 08:35:02 +08:00
|
|
|
command.Printf(" --arch=%s", arch_spec->GetArchitectureName());
|
2010-10-20 02:15:50 +08:00
|
|
|
|
Added a new variant of SBTarget::Launch() that deprectates the old one that
takes separate file handles for stdin, stdout, and stder and also allows for
the working directory to be specified.
Added support to "process launch" to a new option: --working-dir=PATH. We
can now set the working directory. If this is not set, it defaults to that
of the process that has LLDB loaded. Added the working directory to the
host LaunchInNewTerminal function to allows the current working directory
to be set in processes that are spawned in their own terminal. Also hooked this
up to the lldb_private::Process and all mac plug-ins. The linux plug-in had its
API changed, but nothing is making use of it yet. Modfied "debugserver" and
"darwin-debug" to also handle the current working directory options and modified
the code in LLDB that spawns these tools to pass the info along.
Fixed ProcessGDBRemote to properly pass along all file handles for stdin, stdout
and stderr.
After clearing the default values for the stdin/out/err file handles for
process to be NULL, we had a crasher in UserSettingsController::UpdateStringVariable
which is now fixed. Also fixed the setting of boolean values to be able to
be set as "true", "yes", "on", "1" for true (case insensitive) and "false", "no",
"off", or "0" for false.
Fixed debugserver to properly handle files for STDIN, STDOUT and STDERR that are not
already opened. Previous to this fix debugserver would only correctly open and dupe
file handles for the slave side of a pseudo terminal. It now correctly handles
getting STDIN for the inferior from a file, and spitting STDOUT and STDERR out to
files. Also made sure the file handles were correctly opened with the NOCTTY flag
for terminals.
llvm-svn: 124060
2011-01-23 13:56:20 +08:00
|
|
|
if (working_dir)
|
|
|
|
command.Printf(" --working-dir '%s'", working_dir);
|
|
|
|
|
2010-10-20 02:15:50 +08:00
|
|
|
if (disable_aslr)
|
|
|
|
command.PutCString(" --disable-aslr");
|
|
|
|
|
|
|
|
command.PutCString(" --");
|
|
|
|
|
|
|
|
if (argv)
|
|
|
|
{
|
|
|
|
for (size_t i=0; argv[i] != NULL; ++i)
|
|
|
|
{
|
|
|
|
command.Printf(" '%s'", argv[i]);
|
|
|
|
}
|
|
|
|
}
|
2010-10-20 07:16:00 +08:00
|
|
|
command.PutCString (" ; echo Process exited with status $?");
|
|
|
|
|
|
|
|
StreamString applescript_source;
|
|
|
|
|
2010-11-08 11:06:10 +08:00
|
|
|
const char *tty_command = command.GetString().c_str();
|
2010-10-20 07:16:00 +08:00
|
|
|
if (tty_name && tty_name[0])
|
|
|
|
{
|
|
|
|
applescript_source.Printf (applscript_in_existing_tty,
|
2010-11-08 11:06:10 +08:00
|
|
|
tty_command,
|
2010-10-20 07:16:00 +08:00
|
|
|
tty_name);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
applescript_source.Printf (applscript_in_new_tty,
|
2010-11-08 11:06:10 +08:00
|
|
|
tty_command);
|
2010-10-20 07:16:00 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char *script_source = applescript_source.GetString().c_str();
|
|
|
|
//puts (script_source);
|
2010-10-20 02:15:50 +08:00
|
|
|
NSAppleScript* applescript = [[NSAppleScript alloc] initWithSource:[NSString stringWithCString:script_source encoding:NSUTF8StringEncoding]];
|
|
|
|
|
|
|
|
lldb::pid_t pid = LLDB_INVALID_PROCESS_ID;
|
|
|
|
|
|
|
|
Error lldb_error;
|
|
|
|
// Sleep and wait a bit for debugserver to start to listen...
|
|
|
|
ConnectionFileDescriptor file_conn;
|
|
|
|
char connect_url[128];
|
|
|
|
::snprintf (connect_url, sizeof(connect_url), "unix-accept://%s", unix_socket_name.c_str());
|
|
|
|
|
|
|
|
// Spawn a new thread to accept incoming connection on the connect_url
|
|
|
|
// so we can grab the pid from the inferior
|
|
|
|
lldb::thread_t accept_thread = Host::ThreadCreate (unix_socket_name.c_str(),
|
|
|
|
AcceptPIDFromInferior,
|
|
|
|
connect_url,
|
|
|
|
&lldb_error);
|
|
|
|
|
|
|
|
|
|
|
|
[applescript executeAndReturnError:nil];
|
|
|
|
|
|
|
|
thread_result_t accept_thread_result = NULL;
|
|
|
|
if (Host::ThreadJoin (accept_thread, &accept_thread_result, &lldb_error))
|
|
|
|
{
|
|
|
|
if (accept_thread_result)
|
|
|
|
{
|
|
|
|
pid = (intptr_t)accept_thread_result;
|
|
|
|
|
|
|
|
// Wait for process to be stopped the the entry point by watching
|
|
|
|
// for the process status to be set to SSTOP which indicates it it
|
|
|
|
// SIGSTOP'ed at the entry point
|
|
|
|
WaitForProcessToSIGSTOP (pid, 5);
|
|
|
|
}
|
|
|
|
}
|
2010-10-20 07:16:00 +08:00
|
|
|
::unlink (unix_socket_name.c_str());
|
2010-10-20 02:15:50 +08:00
|
|
|
[applescript release];
|
2010-10-01 05:49:03 +08:00
|
|
|
return pid;
|
|
|
|
}
|
2010-10-20 02:15:50 +08:00
|
|
|
|
|
|
|
|
|
|
|
#define LLDB_HOST_USE_APPLESCRIPT
|
|
|
|
|
|
|
|
lldb::pid_t
|
|
|
|
Host::LaunchInNewTerminal
|
|
|
|
(
|
2010-10-20 07:16:00 +08:00
|
|
|
const char *tty_name,
|
2010-10-20 02:15:50 +08:00
|
|
|
const char **argv,
|
|
|
|
const char **envp,
|
Added a new variant of SBTarget::Launch() that deprectates the old one that
takes separate file handles for stdin, stdout, and stder and also allows for
the working directory to be specified.
Added support to "process launch" to a new option: --working-dir=PATH. We
can now set the working directory. If this is not set, it defaults to that
of the process that has LLDB loaded. Added the working directory to the
host LaunchInNewTerminal function to allows the current working directory
to be set in processes that are spawned in their own terminal. Also hooked this
up to the lldb_private::Process and all mac plug-ins. The linux plug-in had its
API changed, but nothing is making use of it yet. Modfied "debugserver" and
"darwin-debug" to also handle the current working directory options and modified
the code in LLDB that spawns these tools to pass the info along.
Fixed ProcessGDBRemote to properly pass along all file handles for stdin, stdout
and stderr.
After clearing the default values for the stdin/out/err file handles for
process to be NULL, we had a crasher in UserSettingsController::UpdateStringVariable
which is now fixed. Also fixed the setting of boolean values to be able to
be set as "true", "yes", "on", "1" for true (case insensitive) and "false", "no",
"off", or "0" for false.
Fixed debugserver to properly handle files for STDIN, STDOUT and STDERR that are not
already opened. Previous to this fix debugserver would only correctly open and dupe
file handles for the slave side of a pseudo terminal. It now correctly handles
getting STDIN for the inferior from a file, and spitting STDOUT and STDERR out to
files. Also made sure the file handles were correctly opened with the NOCTTY flag
for terminals.
llvm-svn: 124060
2011-01-23 13:56:20 +08:00
|
|
|
const char *working_dir,
|
2010-10-20 02:15:50 +08:00
|
|
|
const ArchSpec *arch_spec,
|
|
|
|
bool stop_at_entry,
|
|
|
|
bool disable_aslr
|
|
|
|
)
|
|
|
|
{
|
|
|
|
#if defined (LLDB_HOST_USE_APPLESCRIPT)
|
Added a new variant of SBTarget::Launch() that deprectates the old one that
takes separate file handles for stdin, stdout, and stder and also allows for
the working directory to be specified.
Added support to "process launch" to a new option: --working-dir=PATH. We
can now set the working directory. If this is not set, it defaults to that
of the process that has LLDB loaded. Added the working directory to the
host LaunchInNewTerminal function to allows the current working directory
to be set in processes that are spawned in their own terminal. Also hooked this
up to the lldb_private::Process and all mac plug-ins. The linux plug-in had its
API changed, but nothing is making use of it yet. Modfied "debugserver" and
"darwin-debug" to also handle the current working directory options and modified
the code in LLDB that spawns these tools to pass the info along.
Fixed ProcessGDBRemote to properly pass along all file handles for stdin, stdout
and stderr.
After clearing the default values for the stdin/out/err file handles for
process to be NULL, we had a crasher in UserSettingsController::UpdateStringVariable
which is now fixed. Also fixed the setting of boolean values to be able to
be set as "true", "yes", "on", "1" for true (case insensitive) and "false", "no",
"off", or "0" for false.
Fixed debugserver to properly handle files for STDIN, STDOUT and STDERR that are not
already opened. Previous to this fix debugserver would only correctly open and dupe
file handles for the slave side of a pseudo terminal. It now correctly handles
getting STDIN for the inferior from a file, and spitting STDOUT and STDERR out to
files. Also made sure the file handles were correctly opened with the NOCTTY flag
for terminals.
llvm-svn: 124060
2011-01-23 13:56:20 +08:00
|
|
|
return LaunchInNewTerminalWithAppleScript (tty_name, argv, envp, working_dir, arch_spec, stop_at_entry, disable_aslr);
|
2010-10-20 02:15:50 +08:00
|
|
|
#else
|
Added a new variant of SBTarget::Launch() that deprectates the old one that
takes separate file handles for stdin, stdout, and stder and also allows for
the working directory to be specified.
Added support to "process launch" to a new option: --working-dir=PATH. We
can now set the working directory. If this is not set, it defaults to that
of the process that has LLDB loaded. Added the working directory to the
host LaunchInNewTerminal function to allows the current working directory
to be set in processes that are spawned in their own terminal. Also hooked this
up to the lldb_private::Process and all mac plug-ins. The linux plug-in had its
API changed, but nothing is making use of it yet. Modfied "debugserver" and
"darwin-debug" to also handle the current working directory options and modified
the code in LLDB that spawns these tools to pass the info along.
Fixed ProcessGDBRemote to properly pass along all file handles for stdin, stdout
and stderr.
After clearing the default values for the stdin/out/err file handles for
process to be NULL, we had a crasher in UserSettingsController::UpdateStringVariable
which is now fixed. Also fixed the setting of boolean values to be able to
be set as "true", "yes", "on", "1" for true (case insensitive) and "false", "no",
"off", or "0" for false.
Fixed debugserver to properly handle files for STDIN, STDOUT and STDERR that are not
already opened. Previous to this fix debugserver would only correctly open and dupe
file handles for the slave side of a pseudo terminal. It now correctly handles
getting STDIN for the inferior from a file, and spitting STDOUT and STDERR out to
files. Also made sure the file handles were correctly opened with the NOCTTY flag
for terminals.
llvm-svn: 124060
2011-01-23 13:56:20 +08:00
|
|
|
return LaunchInNewTerminalWithCommandFile (argv, envp, working_dir, arch_spec, stop_at_entry, disable_aslr);
|
2010-10-20 01:03:58 +08:00
|
|
|
#endif
|
2010-10-20 02:15:50 +08:00
|
|
|
}
|
|
|
|
|
2010-11-10 12:57:04 +08:00
|
|
|
// On MacOSX CrashReporter will display a string for each shared library if
|
|
|
|
// the shared library has an exported symbol named "__crashreporter_info__".
|
|
|
|
|
|
|
|
static Mutex&
|
|
|
|
GetCrashReporterMutex ()
|
|
|
|
{
|
|
|
|
static Mutex g_mutex;
|
|
|
|
return g_mutex;
|
|
|
|
}
|
|
|
|
|
|
|
|
extern "C" {
|
|
|
|
const char *__crashreporter_info__ = NULL;
|
|
|
|
};
|
|
|
|
|
|
|
|
asm(".desc ___crashreporter_info__, 0x10");
|
|
|
|
|
|
|
|
void
|
|
|
|
Host::SetCrashDescriptionWithFormat (const char *format, ...)
|
|
|
|
{
|
|
|
|
static StreamString g_crash_description;
|
|
|
|
Mutex::Locker locker (GetCrashReporterMutex ());
|
|
|
|
|
|
|
|
if (format)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
2010-11-11 03:43:40 +08:00
|
|
|
g_crash_description.GetString().clear();
|
2010-11-10 12:57:04 +08:00
|
|
|
g_crash_description.PrintfVarArg(format, args);
|
|
|
|
va_end (args);
|
|
|
|
__crashreporter_info__ = g_crash_description.GetData();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
__crashreporter_info__ = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
Host::SetCrashDescription (const char *cstr)
|
|
|
|
{
|
|
|
|
Mutex::Locker locker (GetCrashReporterMutex ());
|
|
|
|
__crashreporter_info__ = cstr;
|
|
|
|
}
|
2010-10-01 05:49:03 +08:00
|
|
|
|
2010-08-31 03:44:40 +08:00
|
|
|
bool
|
2010-10-01 05:49:03 +08:00
|
|
|
Host::OpenFileInExternalEditor (const FileSpec &file_spec, uint32_t line_no)
|
2010-08-31 03:44:40 +08:00
|
|
|
{
|
|
|
|
// We attach this to an 'odoc' event to specify a particular selection
|
|
|
|
typedef struct {
|
2010-08-31 06:00:34 +08:00
|
|
|
int16_t reserved0; // must be zero
|
|
|
|
int16_t fLineNumber;
|
|
|
|
int32_t fSelStart;
|
|
|
|
int32_t fSelEnd;
|
|
|
|
uint32_t reserved1; // must be zero
|
|
|
|
uint32_t reserved2; // must be zero
|
2010-08-31 03:44:40 +08:00
|
|
|
} BabelAESelInfo;
|
|
|
|
|
2010-11-06 09:53:30 +08:00
|
|
|
LogSP log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_HOST));
|
2010-08-31 03:44:40 +08:00
|
|
|
char file_path[PATH_MAX];
|
|
|
|
file_spec.GetPath(file_path, PATH_MAX);
|
|
|
|
CFCString file_cfstr (file_path, kCFStringEncodingUTF8);
|
2010-08-31 06:00:34 +08:00
|
|
|
CFCReleaser<CFURLRef> file_URL (::CFURLCreateWithFileSystemPath (NULL,
|
|
|
|
file_cfstr.get(),
|
|
|
|
kCFURLPOSIXPathStyle,
|
|
|
|
false));
|
2010-09-01 02:05:13 +08:00
|
|
|
|
|
|
|
if (log)
|
|
|
|
log->Printf("Sending source file: \"%s\" and line: %d to external editor.\n", file_path, line_no);
|
2010-08-31 06:00:34 +08:00
|
|
|
|
2010-08-31 03:44:40 +08:00
|
|
|
OSStatus error;
|
2010-08-31 06:00:34 +08:00
|
|
|
BabelAESelInfo file_and_line_info =
|
|
|
|
{
|
|
|
|
0, // reserved0
|
|
|
|
line_no - 1, // fLineNumber (zero based line number)
|
|
|
|
1, // fSelStart
|
|
|
|
1024, // fSelEnd
|
|
|
|
0, // reserved1
|
|
|
|
0 // reserved2
|
|
|
|
};
|
2010-08-31 03:44:40 +08:00
|
|
|
|
|
|
|
AEKeyDesc file_and_line_desc;
|
|
|
|
|
2010-08-31 06:00:34 +08:00
|
|
|
error = ::AECreateDesc (typeUTF8Text,
|
|
|
|
&file_and_line_info,
|
|
|
|
sizeof (file_and_line_info),
|
|
|
|
&(file_and_line_desc.descContent));
|
2010-08-31 03:44:40 +08:00
|
|
|
|
|
|
|
if (error != noErr)
|
|
|
|
{
|
2010-09-01 02:05:13 +08:00
|
|
|
if (log)
|
|
|
|
log->Printf("Error creating AEDesc: %d.\n", error);
|
2010-08-31 03:44:40 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
file_and_line_desc.descKey = keyAEPosition;
|
|
|
|
|
2010-09-01 02:56:24 +08:00
|
|
|
static std::string g_app_name;
|
2010-09-01 02:35:14 +08:00
|
|
|
static FSRef g_app_fsref;
|
|
|
|
|
2010-08-31 03:44:40 +08:00
|
|
|
LSApplicationParameters app_params;
|
2011-02-05 05:13:05 +08:00
|
|
|
::memset (&app_params, 0, sizeof (app_params));
|
2010-08-31 06:00:34 +08:00
|
|
|
app_params.flags = kLSLaunchDefaults |
|
|
|
|
kLSLaunchDontAddToRecents |
|
|
|
|
kLSLaunchDontSwitch;
|
2010-09-01 02:35:14 +08:00
|
|
|
|
2010-08-31 07:48:25 +08:00
|
|
|
char *external_editor = ::getenv ("LLDB_EXTERNAL_EDITOR");
|
|
|
|
|
2010-09-01 02:35:14 +08:00
|
|
|
if (external_editor)
|
2010-08-31 07:48:25 +08:00
|
|
|
{
|
2010-09-01 02:05:13 +08:00
|
|
|
if (log)
|
|
|
|
log->Printf("Looking for external editor \"%s\".\n", external_editor);
|
|
|
|
|
2010-09-01 02:56:24 +08:00
|
|
|
if (g_app_name.empty() || strcmp (g_app_name.c_str(), external_editor) != 0)
|
2010-08-31 07:48:25 +08:00
|
|
|
{
|
|
|
|
CFCString editor_name (external_editor, kCFStringEncodingUTF8);
|
2010-09-01 02:35:14 +08:00
|
|
|
error = ::LSFindApplicationForInfo (kLSUnknownCreator,
|
|
|
|
NULL,
|
|
|
|
editor_name.get(),
|
|
|
|
&g_app_fsref,
|
|
|
|
NULL);
|
2010-08-31 07:48:25 +08:00
|
|
|
|
|
|
|
// If we found the app, then store away the name so we don't have to re-look it up.
|
2010-09-01 02:35:14 +08:00
|
|
|
if (error != noErr)
|
2010-09-01 02:05:13 +08:00
|
|
|
{
|
|
|
|
if (log)
|
|
|
|
log->Printf("Could not find External Editor application, error: %d.\n", error);
|
2010-08-31 07:48:25 +08:00
|
|
|
return false;
|
2010-09-01 02:05:13 +08:00
|
|
|
}
|
2010-08-31 07:48:25 +08:00
|
|
|
|
|
|
|
}
|
2010-09-01 02:35:14 +08:00
|
|
|
app_params.application = &g_app_fsref;
|
2010-08-31 07:48:25 +08:00
|
|
|
}
|
|
|
|
|
2010-08-31 03:44:40 +08:00
|
|
|
ProcessSerialNumber psn;
|
|
|
|
CFCReleaser<CFArrayRef> file_array(CFArrayCreate (NULL, (const void **) file_URL.ptr_address(false), 1, NULL));
|
2010-08-31 06:00:34 +08:00
|
|
|
error = ::LSOpenURLsWithRole (file_array.get(),
|
2010-08-31 07:48:25 +08:00
|
|
|
kLSRolesAll,
|
2010-08-31 06:00:34 +08:00
|
|
|
&file_and_line_desc,
|
|
|
|
&app_params,
|
|
|
|
&psn,
|
|
|
|
1);
|
|
|
|
|
2010-08-31 03:44:40 +08:00
|
|
|
AEDisposeDesc (&(file_and_line_desc.descContent));
|
|
|
|
|
|
|
|
if (error != noErr)
|
|
|
|
{
|
2010-09-01 02:05:13 +08:00
|
|
|
if (log)
|
|
|
|
log->Printf("LSOpenURLsWithRole failed, error: %d.\n", error);
|
|
|
|
|
2010-08-31 03:44:40 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
ProcessInfoRec which_process;
|
2011-02-05 05:13:05 +08:00
|
|
|
::memset(&which_process, 0, sizeof(which_process));
|
2010-08-31 03:44:40 +08:00
|
|
|
unsigned char ap_name[PATH_MAX];
|
|
|
|
which_process.processName = ap_name;
|
2010-08-31 06:00:34 +08:00
|
|
|
error = ::GetProcessInformation (&psn, &which_process);
|
2010-08-31 03:44:40 +08:00
|
|
|
|
2010-09-01 02:05:13 +08:00
|
|
|
bool using_xcode;
|
|
|
|
if (error != noErr)
|
|
|
|
{
|
|
|
|
if (log)
|
|
|
|
log->Printf("GetProcessInformation failed, error: %d.\n", error);
|
|
|
|
using_xcode = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
using_xcode = strncmp((char *) ap_name+1, "Xcode", (int) ap_name[0]) == 0;
|
2010-08-31 03:44:40 +08:00
|
|
|
|
|
|
|
// Xcode doesn't obey the line number in the Open Apple Event. So I have to send
|
|
|
|
// it an AppleScript to focus on the right line.
|
|
|
|
|
|
|
|
if (using_xcode)
|
|
|
|
{
|
|
|
|
static ComponentInstance osa_component = NULL;
|
|
|
|
static const char *as_template = "tell application \"Xcode\"\n"
|
|
|
|
"set doc to the first document whose path is \"%s\"\n"
|
|
|
|
"set the selection to paragraph %d of doc\n"
|
|
|
|
"--- set the selected paragraph range to {%d, %d} of doc\n"
|
|
|
|
"end tell\n";
|
|
|
|
const int chars_for_int = 32;
|
|
|
|
static int as_template_len = strlen (as_template);
|
|
|
|
|
|
|
|
|
|
|
|
char *as_str;
|
|
|
|
AEDesc as_desc;
|
|
|
|
|
|
|
|
if (osa_component == NULL)
|
|
|
|
{
|
2010-08-31 06:00:34 +08:00
|
|
|
osa_component = ::OpenDefaultComponent (kOSAComponentType,
|
|
|
|
kAppleScriptSubtype);
|
2010-08-31 03:44:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (osa_component == NULL)
|
|
|
|
{
|
2010-09-01 02:05:13 +08:00
|
|
|
if (log)
|
|
|
|
log->Printf("Could not get default AppleScript component.\n");
|
2010-08-31 03:44:40 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint32_t as_str_size = as_template_len + strlen (file_path) + 3 * chars_for_int + 1;
|
|
|
|
as_str = (char *) malloc (as_str_size);
|
2010-08-31 06:00:34 +08:00
|
|
|
::snprintf (as_str,
|
|
|
|
as_str_size - 1,
|
|
|
|
as_template,
|
|
|
|
file_path,
|
|
|
|
line_no,
|
|
|
|
line_no,
|
|
|
|
line_no);
|
|
|
|
|
|
|
|
error = ::AECreateDesc (typeChar,
|
|
|
|
as_str,
|
|
|
|
strlen (as_str),
|
|
|
|
&as_desc);
|
|
|
|
|
|
|
|
::free (as_str);
|
2010-08-31 03:44:40 +08:00
|
|
|
|
|
|
|
if (error != noErr)
|
2010-09-01 02:05:13 +08:00
|
|
|
{
|
|
|
|
if (log)
|
|
|
|
log->Printf("Failed to create AEDesc for Xcode AppleEvent: %d.\n", error);
|
2010-08-31 03:44:40 +08:00
|
|
|
return false;
|
2010-09-01 02:05:13 +08:00
|
|
|
}
|
2010-08-31 03:44:40 +08:00
|
|
|
|
|
|
|
OSAID ret_OSAID;
|
2010-08-31 06:00:34 +08:00
|
|
|
error = ::OSACompileExecute (osa_component,
|
|
|
|
&as_desc,
|
|
|
|
kOSANullScript,
|
|
|
|
kOSAModeNeverInteract,
|
|
|
|
&ret_OSAID);
|
|
|
|
|
|
|
|
::OSADispose (osa_component, ret_OSAID);
|
2010-08-31 03:44:40 +08:00
|
|
|
|
2010-08-31 06:00:34 +08:00
|
|
|
::AEDisposeDesc (&as_desc);
|
2010-08-31 03:44:40 +08:00
|
|
|
|
|
|
|
if (error != noErr)
|
2010-09-01 02:05:13 +08:00
|
|
|
{
|
|
|
|
if (log)
|
|
|
|
log->Printf("Sending AppleEvent to Xcode failed, error: %d.\n", error);
|
2010-08-31 03:44:40 +08:00
|
|
|
return false;
|
2010-09-01 02:05:13 +08:00
|
|
|
}
|
2010-08-31 03:44:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2010-12-03 14:02:24 +08:00
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
Host::Backtrace (Stream &strm, uint32_t max_frames)
|
|
|
|
{
|
|
|
|
char backtrace_path[] = "/tmp/lldb-backtrace-tmp-XXXXXX";
|
|
|
|
int backtrace_fd = ::mkstemp (backtrace_path);
|
|
|
|
if (backtrace_fd != -1)
|
|
|
|
{
|
|
|
|
std::vector<void *> frame_buffer (max_frames, NULL);
|
|
|
|
int count = ::backtrace (&frame_buffer[0], frame_buffer.size());
|
|
|
|
::backtrace_symbols_fd (&frame_buffer[0], count, backtrace_fd);
|
|
|
|
|
|
|
|
const off_t buffer_size = ::lseek(backtrace_fd, 0, SEEK_CUR);
|
|
|
|
|
|
|
|
if (::lseek(backtrace_fd, 0, SEEK_SET) == 0)
|
|
|
|
{
|
|
|
|
char *buffer = (char *)::malloc (buffer_size);
|
|
|
|
if (buffer)
|
|
|
|
{
|
|
|
|
ssize_t bytes_read = ::read (backtrace_fd, buffer, buffer_size);
|
|
|
|
if (bytes_read > 0)
|
|
|
|
strm.Write(buffer, bytes_read);
|
|
|
|
::free (buffer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
::close (backtrace_fd);
|
|
|
|
::unlink (backtrace_path);
|
|
|
|
}
|
|
|
|
}
|
2010-12-04 08:10:17 +08:00
|
|
|
|
|
|
|
size_t
|
|
|
|
Host::GetEnvironment (StringList &env)
|
|
|
|
{
|
|
|
|
char **host_env = *_NSGetEnviron();
|
|
|
|
char *env_entry;
|
|
|
|
size_t i;
|
|
|
|
for (i=0; (env_entry = host_env[i]) != NULL; ++i)
|
|
|
|
env.AppendString(env_entry);
|
|
|
|
return i;
|
|
|
|
|
|
|
|
}
|
2011-03-19 09:12:21 +08:00
|
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
Host::GetOSVersion
|
|
|
|
(
|
|
|
|
uint32_t &major,
|
|
|
|
uint32_t &minor,
|
|
|
|
uint32_t &update
|
|
|
|
)
|
|
|
|
{
|
|
|
|
|
|
|
|
SInt32 version;
|
|
|
|
|
|
|
|
OSErr err = ::Gestalt (gestaltSystemVersion, &version);
|
|
|
|
if (err != noErr)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (version < 0x1040)
|
|
|
|
{
|
|
|
|
major = ((version & 0xF000) >> 12) * 10 + ((version & 0x0F00) >> 8);
|
|
|
|
minor = (version & 0x00F0) >> 4;
|
|
|
|
update = (version & 0x000F);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (::Gestalt (gestaltSystemVersionMajor, &version) != noErr)
|
|
|
|
return false;
|
|
|
|
major = version;
|
|
|
|
|
|
|
|
if (::Gestalt (gestaltSystemVersionMinor, &version) == noErr)
|
|
|
|
minor = version;
|
|
|
|
else
|
|
|
|
minor = 0;
|
|
|
|
|
|
|
|
if (::Gestalt (gestaltSystemVersionBugFix, &version) == noErr)
|
|
|
|
update = version;
|
|
|
|
else
|
|
|
|
update = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|