generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 849bfd58: am 8c1b9668: Merge "Revert "Clean up our alternate signal stacks.""

Browse Source 
* commit '849bfd58118e8c8a4b1ad8a7c3de74bb3cd13863':
  Revert "Clean up our alternate signal stacks."
This commit is contained in:
Guang Zhu 2013-07-16 20:23:41 -07:00 committed by Android Git Automerger
commit dd4eb67a48
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libc/bionic/pthread.c
View File

@ -31,7 +31,6 @@
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <sys/atomics.h> #include <sys/atomics.h>
#include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include "bionic_atomic_inline.h" #include "bionic_atomic_inline.h"
@ -103,18 +102,6 @@ void pthread_exit(void * retval)
// space (see pthread_key_delete) // space (see pthread_key_delete)
pthread_key_clean_all(); pthread_key_clean_all();
if (thread->alternate_signal_stack != NULL) {
// Tell the kernel to stop using the alternate signal stack.
stack_t ss;
ss.ss_sp = NULL;
ss.ss_flags = SS_DISABLE;
sigaltstack(&ss, NULL);
// Free it.
munmap(thread->alternate_signal_stack, SIGSTKSZ);
thread->alternate_signal_stack = NULL;
}
// if the thread is detached, destroy the pthread_internal_t // if the thread is detached, destroy the pthread_internal_t
// otherwise, keep it in memory and signal any joiners. // otherwise, keep it in memory and signal any joiners.
pthread_mutex_lock(&gThreadListLock); pthread_mutex_lock(&gThreadListLock);

1
libc/bionic/pthread_create.cpp
View File

@ -69,7 +69,6 @@ void __init_tls(pthread_internal_t* thread) {
ss.ss_size = SIGSTKSZ; ss.ss_size = SIGSTKSZ;
ss.ss_flags = 0; ss.ss_flags = 0;
sigaltstack(&ss, NULL); sigaltstack(&ss, NULL);
thread->alternate_signal_stack = ss.ss_sp;
} }
// Slot 0 must point to itself. The x86 Linux kernel reads the TLS from %fs:0. // Slot 0 must point to itself. The x86 Linux kernel reads the TLS from %fs:0.

2
libc/bionic/pthread_internal.h
View File

@ -47,8 +47,6 @@ typedef struct pthread_internal_t
__pthread_cleanup_t* cleanup_stack; __pthread_cleanup_t* cleanup_stack;
void** tls; /* thread-local storage area */ void** tls; /* thread-local storage area */
void* alternate_signal_stack;
/* /*
* The dynamic linker implements dlerror(3), which makes it hard for us to implement this * The dynamic linker implements dlerror(3), which makes it hard for us to implement this
* per-thread buffer by simply using malloc(3) and free(3). * per-thread buffer by simply using malloc(3) and free(3).