diff options
| author | Dave Burke <daveburke@google.com> | 2012-10-07 01:06:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-07 01:06:15 -0700 |
| commit | 6d24eef4b6443afa8d361437c0a3a575b69609ae (patch) | |
| tree | 1f571cdd5e5e20b674ecc666a2f107ac7949b9a6 /libs | |
| parent | dba919c5f372872179cd14f8b5beeb4c22fe23c1 (diff) | |
| parent | 0bed1f541d5a8284691d2296754604cde0723787 (diff) | |
| download | frameworks_native-6d24eef4b6443afa8d361437c0a3a575b69609ae.zip frameworks_native-6d24eef4b6443afa8d361437c0a3a575b69609ae.tar.gz frameworks_native-6d24eef4b6443afa8d361437c0a3a575b69609ae.tar.bz2 | |
Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/IPCThreadState.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index 03c1082..6e83faa 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -482,18 +482,6 @@ void IPCThreadState::joinThreadPool(bool isMain) if(result == TIMED_OUT && !isMain) { break; } - - // HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK - // FIXME: we sometimes get unexplained EINVAL which causes this - // thread to spin forever. TEMPORARILY allow it to exit. - // We should probably assert on eng builds - if(result == -EINVAL && !isMain) { - ALOGE("**** THREAD %p (PID %d) ERROR (%d) LEAVING THE THREAD POOL\n", - (void*)pthread_self(), getpid(), result); - break; - } - // HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK HACK - } while (result != -ECONNREFUSED && result != -EBADF); LOG_THREADPOOL("**** THREAD %p (PID %d) IS LEAVING THE THREAD POOL err=%p\n", |