Revision: 968 http://trac.macosforge.org/projects/darwinbuild/changeset/968 Author: kvv@apple.com Date: 2011-11-07 13:05:14 -0800 (Mon, 07 Nov 2011) Log Message: ----------- Merged PR-10397485 Modified Paths: -------------- trunk/CHANGES trunk/darwintrace/darwintrace.c Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-10363375:959-960 /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7872907:830-840 /branches/PR-7935095:819-821 /branches/PR-8116613:849 /branches/PR-8279204:854-862 /branches/PR-8416637:870-880 /branches/PR-8486662:885-889 /branches/PR-8488185:894-898 /branches/PR-8604911:903-905 /branches/PR-8817822:917-933 /branches/PR-8908468:912 + /branches/PR-10363375:959-960 /branches/PR-10397485:967 /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6634286:632-650 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /branches/PR-6729491:655-664 /branches/PR-6973110:804-813 /branches/PR-7250612:635-650 /branches/PR-7341154:682-694 /branches/PR-7431723:660-664 /branches/PR-7461534:650-664 /branches/PR-7482850:670-671 /branches/PR-7489777:676-731 /branches/PR-7529688:692-694 /branches/PR-7593824:739-772 /branches/PR-7598640:703-731 /branches/PR-7748469:777-785 /branches/PR-7765119:790-791 /branches/PR-7798586:796-799 /branches/PR-7872907:830-840 /branches/PR-7935095:819-821 /branches/PR-8116613:849 /branches/PR-8279204:854-862 /branches/PR-8416637:870-880 /branches/PR-8486662:885-889 /branches/PR-8488185:894-898 /branches/PR-8604911:903-905 /branches/PR-8817822:917-933 /branches/PR-8908468:912 Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2011-11-07 19:03:17 UTC (rev 967) +++ trunk/CHANGES 2011-11-07 21:05:14 UTC (rev 968) @@ -1,7 +1,11 @@ Darwin Build Scripts Change History ----------------------------------- +Release 26 [6-Nov-2011] + - darwintrace: preserve DYLD_INSERT_LIBRARIES and DARWINTRACE_LOG + - darwintrace: interpose posix_spawn + Release 25 [4-Nov-2011] - - darwinup: support for rebuilding xpchelper cache + - darwinup: support for rebuilding xpchelper cache Release 24.1 [17-Jun-2011] - Build fixes for newer compilers Modified: trunk/darwintrace/darwintrace.c =================================================================== --- trunk/darwintrace/darwintrace.c 2011-11-07 19:03:17 UTC (rev 967) +++ trunk/darwintrace/darwintrace.c 2011-11-07 21:05:14 UTC (rev 968) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2005-2011 Apple Inc. All rights reserved. * * @APPLE_BSD_LICENSE_HEADER_START@ * @@ -32,6 +32,7 @@ #include <crt_externs.h> #include <fcntl.h> +#include <spawn.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -47,7 +48,7 @@ #define DARWINTRACE_DEBUG_OUTPUT 0 #define DARWINTRACE_START_FD 101 #define DARWINTRACE_STOP_FD 200 -#define DARWINTRACE_BUFFER_SIZE 1024 +#define DARWINTRACE_BUFFER_SIZE 1024 #if DARWINTRACE_DEBUG_OUTPUT #define dprintf(...) fprintf(stderr, __VA_ARGS__) @@ -93,11 +94,15 @@ static char **darwintrace_ignores = NULL; static size_t *darwintrace_ignore_lens = NULL; +/* store environment variables to preserve them on exec */ +static char *darwintrace_dylib_path; +static char *darwintrace_log_path; + /* check if str starts with one of the exceptions */ static inline bool darwintrace_except(const char *str) { size_t c = sizeof(darwintrace_exceptions)/sizeof(*darwintrace_exceptions); size_t i; - for (i = 0; i < c; i++) { + for (i = 0; i < c; i++) { if (strncmp(darwintrace_exceptions[i], str, strlen(darwintrace_exceptions[i])) == 0) { return true; } @@ -128,7 +133,7 @@ } static inline void darwintrace_setup() { - if (darwintrace_fd != -2) return; + if (darwintrace_fd != -2) return; char* path = getenv("DARWINTRACE_LOG"); if (path != NULL) { @@ -145,6 +150,7 @@ break; } } + darwintrace_log_path = strdup(path); errno = olderrno; } @@ -181,6 +187,30 @@ dprintf("unable to allocate memory for darwintrace_ignores"); } } + + /* find the install path of the darwintrace dylib for later use */ + path = getenv("DYLD_INSERT_LIBRARIES"); + if (path != NULL) { + char *ptr = strstr(path, "darwintrace.dylib"); + if (ptr) { + /* scan backward for : or start of string */ + while (ptr > path) { + if (*ptr == ':') { + ++ptr; + break; + } + --ptr; + } + + darwintrace_dylib_path = strdup(ptr); + + /* scan forward for : or end of string and terminate */ + ptr = strchr(darwintrace_dylib_path, ':'); + if (ptr) { + *ptr = 0; + } + } + } } /* darwintrace_setup must have been called already */ @@ -267,7 +297,7 @@ char realpath[MAXPATHLEN]; #if DARWINTRACE_LOG_FULL_PATH int usegetpath = 1; -#else +#else int usegetpath = 0; #endif @@ -334,11 +364,84 @@ } DARWINTRACE_INTERPOSE(darwintrace_readlink, readlink) +static inline int has_prefix(const char *s, const char *p) { + return (strncmp(s, p, strlen(p)) == 0); +} -int darwintrace_execve(const char* path, char* const argv[], char* const envp[]) { - int result; - - char* redirpath = darwintrace_redirect_path(path); +/* force the values of several environment variables */ +static char *const *darwintrace_make_environ(char *const envp[]) { + static const char *DARWINTRACE_IGNORE_ROOTS = "DARWINTRACE_IGNORE_ROOTS="; + static const char *DYLD_INSERT_LIBRARIES = "DYLD_INSERT_LIBRARIES="; + static const char *DARWINTRACE_LOG = "DARWINTRACE_LOG="; + static const char *DARWINTRACE_PLACEHOLDER = "__DARWINTRACE_PLACEHOLDER=UNUSED"; + + char **result = NULL; + char *libs = NULL; + int count = 0; + + /* count the environment variables */ + while (envp[count] != NULL) { + if (has_prefix(envp[count], DYLD_INSERT_LIBRARIES)) { + libs = envp[count] + strlen(DYLD_INSERT_LIBRARIES); + } + ++count; + } + + /* allocate size of envp with enough space for three more values and NULL */ + result = (char **)calloc(count + 4, sizeof(char *)); + if (result != NULL) { + int i = 0; + + if (darwintrace_log_path) { + asprintf(&result[i], "%s%s", DARWINTRACE_LOG, darwintrace_log_path); + } else { + result[i] = strdup(DARWINTRACE_PLACEHOLDER); + } + ++i; + + if (darwintrace_ignores) { + asprintf(&result[i], "%s%s", DARWINTRACE_IGNORE_ROOTS, "1"); + } else { + result[i] = strdup(DARWINTRACE_PLACEHOLDER); + } + ++i; + + if (darwintrace_dylib_path) { + int add_dylib = (strstr(libs, darwintrace_dylib_path) == NULL); + asprintf(&result[i], + "%s%s%s%s", + DYLD_INSERT_LIBRARIES, + add_dylib ? darwintrace_dylib_path : "", + (add_dylib && libs) ? ":" : "", + libs ? libs : ""); + } else { + result[i] = strdup(DARWINTRACE_PLACEHOLDER); + } + ++i; + + memcpy(&result[i], envp, count * sizeof(char *)); + + while (result[i] != NULL) { + if (has_prefix(result[i], DARWINTRACE_IGNORE_ROOTS) || + has_prefix(result[i], DYLD_INSERT_LIBRARIES) || + has_prefix(result[i], DARWINTRACE_LOG)) { + result[i] = (char *)DARWINTRACE_PLACEHOLDER; + } + ++i; + } + } + + return result; +} + +static void darwintrace_free_environ(char *const envp[]) { + free(envp[0]); + free(envp[1]); + free(envp[2]); + free((char*)envp); +} + +void darwintrace_log_exec(const char* redirpath, char* const argv[]) { darwintrace_setup(); if (darwintrace_fd >= 0) { struct stat sb; @@ -348,7 +451,7 @@ int fd; #if DARWINTRACE_LOG_FULL_PATH int usegetpath = 1; -#else +#else int usegetpath = 0; #endif @@ -382,7 +485,7 @@ darwintrace_cleanup_path(realpath); darwintrace_logpath(darwintrace_fd, NULL, "execve", realpath); } - + fd = open(redirpath, O_RDONLY, 0); if (fd != -1) { @@ -456,14 +559,40 @@ } } } - - result = execve(redirpath, argv, envp); - darwintrace_free_path(redirpath, path); - return result; } + +int darwintrace_execve(const char* path, char* const argv[], char* const envp[]) { + int result; + char* redirpath = darwintrace_redirect_path(path); + darwintrace_log_exec(redirpath, argv); + envp = darwintrace_make_environ(envp); + result = execve(redirpath, argv, envp); + darwintrace_free_environ(envp); + darwintrace_free_path(redirpath, path); + return result; +} DARWINTRACE_INTERPOSE(darwintrace_execve, execve) +extern int __posix_spawn(pid_t * __restrict, const char * __restrict, + void *, + char *const argv[ __restrict], char *const envp[ __restrict]); +int darwintrace_posix_spawn(pid_t * __restrict pid, + const char * __restrict path, + void * __restrict desc, + char *const argv[__restrict], + char *const envp[__restrict]) { + int result; + char* redirpath = darwintrace_redirect_path(path); + darwintrace_log_exec(redirpath, argv); + envp = darwintrace_make_environ(envp); + result = __posix_spawn(pid, redirpath, desc, argv, envp); + darwintrace_free_environ(envp); + darwintrace_free_path(redirpath, path); + return result; +} +DARWINTRACE_INTERPOSE(darwintrace_posix_spawn, __posix_spawn) + /* if darwintrace has been initialized, trap attempts to close our file descriptor