tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am d917d64f: Merge "Only copy mcontext data from sigcontext."

Browse source 
* commit 'd917d64fafb2eca22c9c75a8527eb4e920a9f079':
  Only copy mcontext data from sigcontext.
This commit is contained in:
Christopher Ferris 2014-05-23 22:28:43 +00:00 committed by Android Git Automerger
commit a0962b687a
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libbacktrace/BacktraceThread.cpp
View file

@ -117,6 +117,12 @@ void ThreadEntry::Wake() {
futex(&futex_, FUTEX_WAKE, INT_MAX, NULL, NULL, 0);
}
void ThreadEntry::CopyUcontextFromSigcontext(void* sigcontext) {
ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(sigcontext);
// The only thing the unwinder cares about is the mcontext data.
memcpy(&ucontext_.uc_mcontext, &ucontext->uc_mcontext, sizeof(ucontext->uc_mcontext));
}
//-------------------------------------------------------------------------
// BacktraceThread functions.
//-------------------------------------------------------------------------
@ -129,7 +135,7 @@ static void SignalHandler(int, siginfo_t*, void* sigcontext) {
return;
}
entry->CopyUcontext(reinterpret_cast<ucontext_t*>(sigcontext));
entry->CopyUcontextFromSigcontext(sigcontext);
// Indicate the ucontext is now valid.
entry->Wake();

6
libbacktrace/BacktraceThread.h
View file

@ -40,14 +40,12 @@ public:
static void Remove(ThreadEntry* entry);
inline void CopyUcontext(ucontext_t* ucontext) {
memcpy(&ucontext_, ucontext, sizeof(ucontext_));
}
void Wake();
void Wait(int);
void CopyUcontextFromSigcontext(void*);
inline void Lock() {
pthread_mutex_lock(&mutex_);
// Reset the futex value in case of multiple unwinds of the same thread.