OSDN Git Service

Merge "Let g_thread_list_lock only protect g_thread_list."
authorYabin Cui <yabinc@google.com>
Tue, 24 Mar 2015 02:39:50 +0000 (02:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 24 Mar 2015 02:39:51 +0000 (02:39 +0000)
1  2 
libc/bionic/pthread_create.cpp
libc/bionic/pthread_internal.h

Simple merge
@@@ -103,12 -103,16 +103,16 @@@ struct pthread_internal_t 
     */
  #define __BIONIC_DLERROR_BUFFER_SIZE 512
    char dlerror_buffer[__BIONIC_DLERROR_BUFFER_SIZE];
 -} __attribute__((aligned(16))); // Align it as thread stack top below it should be aligned.
 +};
  
- __LIBC_HIDDEN__ int __init_thread(pthread_internal_t* thread, bool add_to_thread_list);
+ __LIBC_HIDDEN__ int __init_thread(pthread_internal_t* thread);
  __LIBC_HIDDEN__ void __init_tls(pthread_internal_t* thread);
  __LIBC_HIDDEN__ void __init_alternate_signal_stack(pthread_internal_t*);
- __LIBC_HIDDEN__ void _pthread_internal_add(pthread_internal_t* thread);
+ __LIBC_HIDDEN__ pthread_t           __pthread_internal_add(pthread_internal_t* thread);
+ __LIBC_HIDDEN__ pthread_internal_t* __pthread_internal_find(pthread_t pthread_id);
+ __LIBC_HIDDEN__ void                __pthread_internal_remove(pthread_internal_t* thread);
+ __LIBC_HIDDEN__ void                __pthread_internal_remove_and_free(pthread_internal_t* thread);
  
  // Make __get_thread() inlined for performance reason. See http://b/19825434.
  static inline __always_inline pthread_internal_t* __get_thread() {