diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-18 18:04:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:08:14 +0000 |
| commit | 7fb0ee0c4d3ba83ec960493e43cba9cfa7a6130f (patch) | |
| tree | ee1840891b5f8031b7085326eed4a1418068e937 | |
| parent | 5f231a43b342fcfbd778d14f953b0b63715ee7f2 (diff) | |
| parent | b7659613b2eed5df47e3e7ec536012772cc08b61 (diff) | |
| download | system_core-7fb0ee0c4d3ba83ec960493e43cba9cfa7a6130f.zip system_core-7fb0ee0c4d3ba83ec960493e43cba9cfa7a6130f.tar.gz system_core-7fb0ee0c4d3ba83ec960493e43cba9cfa7a6130f.tar.bz2 | |
Merge "Remove androidGetTid."
| -rw-r--r-- | include/utils/AndroidThreads.h | 3 | ||||
| -rw-r--r-- | include/utils/Thread.h | 4 | ||||
| -rw-r--r-- | libcutils/sched_policy.c | 4 | ||||
| -rw-r--r-- | libutils/Threads.cpp | 9 |
4 files changed, 2 insertions, 18 deletions
diff --git a/include/utils/AndroidThreads.h b/include/utils/AndroidThreads.h index 4eee14d..3c640b6 100644 --- a/include/utils/AndroidThreads.h +++ b/include/utils/AndroidThreads.h @@ -73,9 +73,6 @@ extern void androidSetCreateThreadFunc(android_create_thread_fn func); // ------------------------------------------------------------------ // Extra functions working with raw pids. -// Get pid for the current thread. -extern pid_t androidGetTid(); - #ifdef HAVE_ANDROID_OS // Change the priority AND scheduling group of a particular thread. The priority // should be one of the ANDROID_PRIORITY constants. Returns INVALID_OPERATION diff --git a/include/utils/Thread.h b/include/utils/Thread.h index df30611..c867e95 100644 --- a/include/utils/Thread.h +++ b/include/utils/Thread.h @@ -71,8 +71,8 @@ public: bool isRunning() const; #ifdef HAVE_ANDROID_OS - // Return the thread's kernel ID, same as the thread itself calling gettid() or - // androidGetTid(), or -1 if the thread is not running. + // Return the thread's kernel ID, same as the thread itself calling gettid(), + // or -1 if the thread is not running. pid_t getTid() const; #endif diff --git a/libcutils/sched_policy.c b/libcutils/sched_policy.c index 9f092d6..12fc734 100644 --- a/libcutils/sched_policy.c +++ b/libcutils/sched_policy.c @@ -222,11 +222,9 @@ static int getSchedulerGroup(int tid, char* buf, size_t bufLen) int get_sched_policy(int tid, SchedPolicy *policy) { -#ifdef HAVE_GETTID if (tid == 0) { tid = gettid(); } -#endif pthread_once(&the_once, __initialize); if (__sys_supports_schedgroups) { @@ -261,11 +259,9 @@ int get_sched_policy(int tid, SchedPolicy *policy) int set_sched_policy(int tid, SchedPolicy policy) { -#ifdef HAVE_GETTID if (tid == 0) { tid = gettid(); } -#endif policy = _policy(policy); pthread_once(&the_once, __initialize); diff --git a/libutils/Threads.cpp b/libutils/Threads.cpp index b09d510..03fde97 100644 --- a/libutils/Threads.cpp +++ b/libutils/Threads.cpp @@ -306,15 +306,6 @@ void androidSetCreateThreadFunc(android_create_thread_fn func) gCreateThreadFn = func; } -pid_t androidGetTid() -{ -#ifdef HAVE_GETTID - return gettid(); -#else - return getpid(); -#endif -} - #ifdef HAVE_ANDROID_OS int androidSetThreadPriority(pid_t tid, int pri) { |