diff options
| author | Elliott Hughes <enh@google.com> | 2012-03-12 10:32:02 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-03-12 10:32:02 -0700 |
| commit | 73b5cad989da317cc8089b57ee25f502b1cac71f (patch) | |
| tree | 00a129ca73e415545e7a629ceb1ec4e7bbe525ef /libc | |
| parent | a58c88c235bfeeb17ac495991e66f7b906935852 (diff) | |
| parent | d8bc6e7119450f263afcf89c8b581f6aaa23d186 (diff) | |
| download | android_bionic-73b5cad989da317cc8089b57ee25f502b1cac71f.tar.gz android_bionic-73b5cad989da317cc8089b57ee25f502b1cac71f.tar.bz2 android_bionic-73b5cad989da317cc8089b57ee25f502b1cac71f.zip | |
Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/fork.c | 4 | ||||
| -rw-r--r-- | libc/bionic/pthread.c | 11 | ||||
| -rw-r--r-- | libc/private/bionic_pthread.h | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/libc/bionic/fork.c b/libc/bionic/fork.c index 0eedb0119..2d5a10a8d 100644 --- a/libc/bionic/fork.c +++ b/libc/bionic/fork.c @@ -27,6 +27,7 @@ */ #include <unistd.h> #include "pthread_internal.h" +#include "bionic_pthread.h" #include "cpuacct.h" extern int __fork(void); @@ -48,6 +49,9 @@ int fork(void) __timer_table_start_stop(0); __bionic_atfork_run_parent(); } else { + /* Adjusting the kernel id after a fork */ + (void)__pthread_settid(pthread_self(), gettid()); + /* * Newly created process must update cpu accounting. * Call cpuacct_add passing in our uid, which will take diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c index 3435d219c..885adccb5 100644 --- a/libc/bionic/pthread.c +++ b/libc/bionic/pthread.c @@ -2011,3 +2011,14 @@ pid_t __pthread_gettid(pthread_t thid) pthread_internal_t* thread = (pthread_internal_t*)thid; return thread->kernel_id; } + +int __pthread_settid(pthread_t thid, pid_t tid) +{ + if (thid == 0) + return EINVAL; + + pthread_internal_t* thread = (pthread_internal_t*)thid; + thread->kernel_id = tid; + + return 0; +} diff --git a/libc/private/bionic_pthread.h b/libc/private/bionic_pthread.h index 07bcbd4b0..28d6ad83e 100644 --- a/libc/private/bionic_pthread.h +++ b/libc/private/bionic_pthread.h @@ -35,6 +35,7 @@ __BEGIN_DECLS /* Internal, not an NDK API */ extern pid_t __pthread_gettid(pthread_t thid); +extern int __pthread_settid(pthread_t thid, pid_t tid); __END_DECLS |