Skip to content

Commit

Permalink
Staging: android: binder: Add some missing binder_stat_br calls
Browse files Browse the repository at this point in the history
Cached thread return errors, death notifications and new looper
requests were not included in the stats.

Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Arve Hjønnevåg authored and Greg Kroah-Hartman committed Oct 22, 2012
1 parent 509f3f7 commit 89334ab
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/staging/android/binder.c
Original file line number Diff line number Diff line change
Expand Up @@ -2135,13 +2135,15 @@ static int binder_thread_read(struct binder_proc *proc,
if (put_user(thread->return_error2, (uint32_t __user *)ptr))
return -EFAULT;
ptr += sizeof(uint32_t);
binder_stat_br(proc, thread, thread->return_error2);
if (ptr == end)
goto done;
thread->return_error2 = BR_OK;
}
if (put_user(thread->return_error, (uint32_t __user *)ptr))
return -EFAULT;
ptr += sizeof(uint32_t);
binder_stat_br(proc, thread, thread->return_error);
thread->return_error = BR_OK;
goto done;
}
Expand Down Expand Up @@ -2297,6 +2299,7 @@ static int binder_thread_read(struct binder_proc *proc,
if (put_user(death->cookie, (void * __user *)ptr))
return -EFAULT;
ptr += sizeof(void *);
binder_stat_br(proc, thread, cmd);
binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,
"binder: %d:%d %s %p\n",
proc->pid, thread->pid,
Expand Down Expand Up @@ -2404,6 +2407,7 @@ static int binder_thread_read(struct binder_proc *proc,
proc->pid, thread->pid);
if (put_user(BR_SPAWN_LOOPER, (uint32_t __user *)buffer))
return -EFAULT;
binder_stat_br(proc, thread, BR_SPAWN_LOOPER);
}
return 0;
}
Expand Down

0 comments on commit 89334ab

Please sign in to comment.