Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 21:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1171125 - Fix nsStackWalk to build for iOS. r=froydnj

Browse Source 
--HG--
extra : commitid : 611nBr14g2p
extra : rebase_source : e2a00b1ed8048fcb04732c3225e3fe938247b0d3
This commit is contained in:
Ted Mielczarek 2015-02-04 10:50:10 -05:00
parent 5ad09caf62
commit 2599be2191
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
xpcom/base/nsStackWalk.cpp
View File

@ -34,12 +34,12 @@ static CriticalAddress gCriticalAddress;
#define _GNU_SOURCE
#endif
#if defined(HAVE_DLOPEN) || defined(XP_MACOSX)
#if defined(HAVE_DLOPEN) || defined(XP_DARWIN)
#include <dlfcn.h>
#endif
#define NSSTACKWALK_SUPPORTS_MACOSX \
(defined(XP_MACOSX) && \
(defined(XP_DARWIN) && \
(defined(__i386) || defined(__ppc__) || defined(HAVE__UNWIND_BACKTRACE)))
#define NSSTACKWALK_SUPPORTS_LINUX \
@ -49,7 +49,10 @@ static CriticalAddress gCriticalAddress;
#if NSSTACKWALK_SUPPORTS_MACOSX
#include <pthread.h>
#include <sys/errno.h>
#ifdef MOZ_WIDGET_COCOA
#include <CoreServices/CoreServices.h>
#endif
typedef void
malloc_logger_t(uint32_t aType,
@ -74,7 +77,7 @@ stack_callback(uint32_t aFrameNumber, void* aPc, void* aSp, void* aClosure)
gCriticalAddress.mAddr = aPc;
}
#ifdef DEBUG
#if defined(MOZ_WIDGET_COCOA) && defined(DEBUG)
#define MAC_OS_X_VERSION_10_7_HEX 0x00001070
static int32_t OSXVersion()
@ -152,7 +155,9 @@ StackWalkInitCriticalAddress()
// On Lion, malloc is no longer called from pthread_cond_*wait*. This prevents
// us from finding the address, but that is fine, since with no call to malloc
// there is no critical address.
#ifdef MOZ_WIDGET_COCOA
MOZ_ASSERT(OnLionOrLater() || gCriticalAddress.mAddr != nullptr);
#endif
MOZ_ASSERT(r == ETIMEDOUT);
r = pthread_mutex_unlock(&mutex);
MOZ_ASSERT(r == 0);