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

am e39e47c6: Merge "Remove "private/bionic_pthread.h"."

Browse Source 
* commit 'e39e47c6b377170d696c6b9b5b523a28c1382ca4':
  Remove "private/bionic_pthread.h".
This commit is contained in:
Elliott Hughes
2014-09-12 20:08:45 +00:00
committed by Android Git Automerger
parent b58b821056 e39e47c6b3
commit ecd6be3bd2
3 changed files with 5 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libc/bionic/ndk_cruft.cpp
View File

@@ -320,4 +320,9 @@ extern "C" size_t dlmalloc_usable_size(void* ptr) {
return malloc_usable_size(ptr); return malloc_usable_size(ptr);
} }
// In L we added a public pthread_gettid_np, but some apps were using the private API.
extern "C" pid_t __pthread_gettid(pthread_t t) {
return pthread_gettid_np(t);
}
#endif #endif

6
libc/bionic/pthread_gettid_np.cpp
View File

@@ -27,13 +27,7 @@
*/ */
#include "pthread_internal.h" #include "pthread_internal.h"
#include "private/bionic_pthread.h"
pid_t pthread_gettid_np(pthread_t t) { pid_t pthread_gettid_np(pthread_t t) {
return reinterpret_cast<pthread_internal_t*>(t)->tid; return reinterpret_cast<pthread_internal_t*>(t)->tid;
} }
// TODO: move callers over to pthread_gettid_np and remove this.
pid_t __pthread_gettid(pthread_t t) {
return pthread_gettid_np(t);
}

41
libc/private/bionic_pthread.h
View File

@@ -1,41 +0,0 @@
/*
* Copyright (C) 2011 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _BIONIC_PTHREAD_H
#define _BIONIC_PTHREAD_H
#include <sys/cdefs.h>
__BEGIN_DECLS
/* Internal, not an NDK API */
extern pid_t __pthread_gettid(pthread_t thid);
__END_DECLS
#endif /* _BIONIC_PTHREAD_H */