Skip to content

L
linux-davinci
Commit 8683b987 authored by Daniel Walker's avatar Daniel Walker Committed by Greg Kroah-Hartman
Browse files
Options

staging: android: binder: clean up for all the stat statments 

An initial cleanup of all the binder_stat statements. The binder
command and return stats still need some assistance tho.
Signed-off-by: default avatarDaniel Walker <dwalker@fifo99.com>
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 39e420e0
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 22 deletions
drivers/staging/android/binder.c
View file @ 8683b987
...@@ -117,7 +117,7 @@ module_param_call(stop_on_user_error, binder_set_stop_on_user_error, ...@@ -117,7 +117,7 @@ module_param_call(stop_on_user_error, binder_set_stop_on_user_error,
binder_stop_on_user_error = 2; \ binder_stop_on_user_error = 2; \
} while (0) } while (0)
enum { enum binder_stat_types {
BINDER_STAT_PROC, BINDER_STAT_PROC,
BINDER_STAT_THREAD, BINDER_STAT_THREAD,
BINDER_STAT_NODE, BINDER_STAT_NODE,
...@@ -137,6 +137,16 @@ struct binder_stats { ...@@ -137,6 +137,16 @@ struct binder_stats {
static struct binder_stats binder_stats; static struct binder_stats binder_stats;
static inline void binder_stats_deleted(enum binder_stat_types type)
{
binder_stats.obj_deleted[type]++;
}
static inline void binder_stats_created(enum binder_stat_types type)
{
binder_stats.obj_created[type]++;
}
struct binder_transaction_log_entry { struct binder_transaction_log_entry {
int debug_id; int debug_id;
int call_type; int call_type;
...@@ -937,7 +947,7 @@ static struct binder_node *binder_new_node(struct binder_proc *proc, ...@@ -937,7 +947,7 @@ static struct binder_node *binder_new_node(struct binder_proc *proc,
node = kzalloc(sizeof(*node), GFP_KERNEL); node = kzalloc(sizeof(*node), GFP_KERNEL);
if (node == NULL) if (node == NULL)
return NULL; return NULL;
binder_stats.obj_created[BINDER_STAT_NODE]++; binder_stats_created(BINDER_STAT_NODE);
rb_link_node(&node->rb_node, parent, p); rb_link_node(&node->rb_node, parent, p);
rb_insert_color(&node->rb_node, &proc->nodes); rb_insert_color(&node->rb_node, &proc->nodes);
node->debug_id = ++binder_last_id; node->debug_id = ++binder_last_id;
...@@ -1025,7 +1035,7 @@ static int binder_dec_node(struct binder_node *node, int strong, int internal) ...@@ -1025,7 +1035,7 @@ static int binder_dec_node(struct binder_node *node, int strong, int internal)
node->debug_id); node->debug_id);
} }
kfree(node); kfree(node);
binder_stats.obj_deleted[BINDER_STAT_NODE]++; binder_stats_deleted(BINDER_STAT_NODE);
} }
} }
...@@ -1074,7 +1084,7 @@ static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc, ...@@ -1074,7 +1084,7 @@ static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,
new_ref = kzalloc(sizeof(*ref), GFP_KERNEL); new_ref = kzalloc(sizeof(*ref), GFP_KERNEL);
if (new_ref == NULL) if (new_ref == NULL)
return NULL; return NULL;
binder_stats.obj_created[BINDER_STAT_REF]++; binder_stats_created(BINDER_STAT_REF);
new_ref->debug_id = ++binder_last_id; new_ref->debug_id = ++binder_last_id;
new_ref->proc = proc; new_ref->proc = proc;
new_ref->node = node; new_ref->node = node;
...@@ -1139,10 +1149,10 @@ static void binder_delete_ref(struct binder_ref *ref) ...@@ -1139,10 +1149,10 @@ static void binder_delete_ref(struct binder_ref *ref)
ref->debug_id, ref->desc); ref->debug_id, ref->desc);
list_del(&ref->death->work.entry); list_del(&ref->death->work.entry);
kfree(ref->death); kfree(ref->death);
binder_stats.obj_deleted[BINDER_STAT_DEATH]++; binder_stats_deleted(BINDER_STAT_DEATH);
} }
kfree(ref); kfree(ref);
binder_stats.obj_deleted[BINDER_STAT_REF]++; binder_stats_deleted(BINDER_STAT_REF);
} }
static int binder_inc_ref(struct binder_ref *ref, int strong, static int binder_inc_ref(struct binder_ref *ref, int strong,
...@@ -1214,7 +1224,7 @@ static void binder_pop_transaction(struct binder_thread *target_thread, ...@@ -1214,7 +1224,7 @@ static void binder_pop_transaction(struct binder_thread *target_thread,
if (t->buffer) if (t->buffer)
t->buffer->transaction = NULL; t->buffer->transaction = NULL;
kfree(t); kfree(t);
binder_stats.obj_deleted[BINDER_STAT_TRANSACTION]++; binder_stats_deleted(BINDER_STAT_TRANSACTION);
} }
static void binder_send_failed_reply(struct binder_transaction *t, static void binder_send_failed_reply(struct binder_transaction *t,
...@@ -1471,14 +1481,14 @@ static void binder_transaction(struct binder_proc *proc, ...@@ -1471,14 +1481,14 @@ static void binder_transaction(struct binder_proc *proc,
return_error = BR_FAILED_REPLY; return_error = BR_FAILED_REPLY;
goto err_alloc_t_failed; goto err_alloc_t_failed;
} }
binder_stats.obj_created[BINDER_STAT_TRANSACTION]++; binder_stats_created(BINDER_STAT_TRANSACTION);
tcomplete = kzalloc(sizeof(*tcomplete), GFP_KERNEL); tcomplete = kzalloc(sizeof(*tcomplete), GFP_KERNEL);
if (tcomplete == NULL) { if (tcomplete == NULL) {
return_error = BR_FAILED_REPLY; return_error = BR_FAILED_REPLY;
goto err_alloc_tcomplete_failed; goto err_alloc_tcomplete_failed;
} }
binder_stats.obj_created[BINDER_STAT_TRANSACTION_COMPLETE]++; binder_stats_created(BINDER_STAT_TRANSACTION_COMPLETE);
t->debug_id = ++binder_last_id; t->debug_id = ++binder_last_id;
e->debug_id = t->debug_id; e->debug_id = t->debug_id;
...@@ -1720,10 +1730,10 @@ err_copy_data_failed: ...@@ -1720,10 +1730,10 @@ err_copy_data_failed:
binder_free_buf(target_proc, t->buffer); binder_free_buf(target_proc, t->buffer);
err_binder_alloc_buf_failed: err_binder_alloc_buf_failed:
kfree(tcomplete); kfree(tcomplete);
binder_stats.obj_deleted[BINDER_STAT_TRANSACTION_COMPLETE]++; binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
err_alloc_tcomplete_failed: err_alloc_tcomplete_failed:
kfree(t); kfree(t);
binder_stats.obj_deleted[BINDER_STAT_TRANSACTION]++; binder_stats_deleted(BINDER_STAT_TRANSACTION);
err_alloc_t_failed: err_alloc_t_failed:
err_bad_call_stack: err_bad_call_stack:
err_empty_call_stack: err_empty_call_stack:
...@@ -2039,7 +2049,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread, ...@@ -2039,7 +2049,7 @@ int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
proc->pid, thread->pid); proc->pid, thread->pid);
break; break;
} }
binder_stats.obj_created[BINDER_STAT_DEATH]++; binder_stats_created(BINDER_STAT_DEATH);
INIT_LIST_HEAD(&death->work.entry); INIT_LIST_HEAD(&death->work.entry);
death->cookie = cookie; death->cookie = cookie;
ref->death = death; ref->death = death;
...@@ -2266,7 +2276,7 @@ retry: ...@@ -2266,7 +2276,7 @@ retry:
list_del(&w->entry); list_del(&w->entry);
kfree(w); kfree(w);
binder_stats.obj_deleted[BINDER_STAT_TRANSACTION_COMPLETE]++; binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
} break; } break;
case BINDER_WORK_NODE: { case BINDER_WORK_NODE: {
struct binder_node *node = container_of(w, struct binder_node, work); struct binder_node *node = container_of(w, struct binder_node, work);
...@@ -2319,7 +2329,7 @@ retry: ...@@ -2319,7 +2329,7 @@ retry:
node->ptr, node->cookie); node->ptr, node->cookie);
rb_erase(&node->rb_node, &proc->nodes); rb_erase(&node->rb_node, &proc->nodes);
kfree(node); kfree(node);
binder_stats.obj_deleted[BINDER_STAT_NODE]++; binder_stats_deleted(BINDER_STAT_NODE);
} else { } else {
binder_debug(BINDER_DEBUG_INTERNAL_REFS, binder_debug(BINDER_DEBUG_INTERNAL_REFS,
"binder: %d:%d node %d u%p c%p state unchanged\n", "binder: %d:%d node %d u%p c%p state unchanged\n",
...@@ -2356,7 +2366,7 @@ retry: ...@@ -2356,7 +2366,7 @@ retry:
if (w->type == BINDER_WORK_CLEAR_DEATH_NOTIFICATION) { if (w->type == BINDER_WORK_CLEAR_DEATH_NOTIFICATION) {
list_del(&w->entry); list_del(&w->entry);
kfree(death); kfree(death);
binder_stats.obj_deleted[BINDER_STAT_DEATH]++; binder_stats_deleted(BINDER_STAT_DEATH);
} else } else
list_move(&w->entry, &proc->delivered_death); list_move(&w->entry, &proc->delivered_death);
if (cmd == BR_DEAD_BINDER) if (cmd == BR_DEAD_BINDER)
...@@ -2433,7 +2443,7 @@ retry: ...@@ -2433,7 +2443,7 @@ retry:
} else { } else {
t->buffer->transaction = NULL; t->buffer->transaction = NULL;
kfree(t); kfree(t);
binder_stats.obj_deleted[BINDER_STAT_TRANSACTION]++; binder_stats_deleted(BINDER_STAT_TRANSACTION);
} }
break; break;
} }
...@@ -2472,7 +2482,7 @@ static void binder_release_work(struct list_head *list) ...@@ -2472,7 +2482,7 @@ static void binder_release_work(struct list_head *list)
} break; } break;
case BINDER_WORK_TRANSACTION_COMPLETE: { case BINDER_WORK_TRANSACTION_COMPLETE: {
kfree(w); kfree(w);
binder_stats.obj_deleted[BINDER_STAT_TRANSACTION_COMPLETE]++; binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
} break; } break;
default: default:
break; break;
...@@ -2502,7 +2512,7 @@ static struct binder_thread *binder_get_thread(struct binder_proc *proc) ...@@ -2502,7 +2512,7 @@ static struct binder_thread *binder_get_thread(struct binder_proc *proc)
thread = kzalloc(sizeof(*thread), GFP_KERNEL); thread = kzalloc(sizeof(*thread), GFP_KERNEL);
if (thread == NULL) if (thread == NULL)
return NULL; return NULL;
binder_stats.obj_created[BINDER_STAT_THREAD]++; binder_stats_created(BINDER_STAT_THREAD);
thread->proc = proc; thread->proc = proc;
thread->pid = current->pid; thread->pid = current->pid;
init_waitqueue_head(&thread->wait); init_waitqueue_head(&thread->wait);
...@@ -2553,7 +2563,7 @@ static int binder_free_thread(struct binder_proc *proc, ...@@ -2553,7 +2563,7 @@ static int binder_free_thread(struct binder_proc *proc,
binder_send_failed_reply(send_reply, BR_DEAD_REPLY); binder_send_failed_reply(send_reply, BR_DEAD_REPLY);
binder_release_work(&thread->todo); binder_release_work(&thread->todo);
kfree(thread); kfree(thread);
binder_stats.obj_deleted[BINDER_STAT_THREAD]++; binder_stats_deleted(BINDER_STAT_THREAD);
return active_transactions; return active_transactions;
} }
...@@ -2852,7 +2862,7 @@ static int binder_open(struct inode *nodp, struct file *filp) ...@@ -2852,7 +2862,7 @@ static int binder_open(struct inode *nodp, struct file *filp)
init_waitqueue_head(&proc->wait); init_waitqueue_head(&proc->wait);
proc->default_priority = task_nice(current); proc->default_priority = task_nice(current);
mutex_lock(&binder_lock); mutex_lock(&binder_lock);
binder_stats.obj_created[BINDER_STAT_PROC]++; binder_stats_created(BINDER_STAT_PROC);
hlist_add_head(&proc->proc_node, &binder_procs); hlist_add_head(&proc->proc_node, &binder_procs);
proc->pid = current->group_leader->pid; proc->pid = current->group_leader->pid;
INIT_LIST_HEAD(&proc->delivered_death); INIT_LIST_HEAD(&proc->delivered_death);
...@@ -2948,7 +2958,7 @@ static void binder_deferred_release(struct binder_proc *proc) ...@@ -2948,7 +2958,7 @@ static void binder_deferred_release(struct binder_proc *proc)
list_del_init(&node->work.entry); list_del_init(&node->work.entry);
if (hlist_empty(&node->refs)) { if (hlist_empty(&node->refs)) {
kfree(node); kfree(node);
binder_stats.obj_deleted[BINDER_STAT_NODE]++; binder_stats_deleted(BINDER_STAT_NODE);
} else { } else {
struct binder_ref *ref; struct binder_ref *ref;
int death = 0; int death = 0;
...@@ -3002,7 +3012,7 @@ static void binder_deferred_release(struct binder_proc *proc) ...@@ -3002,7 +3012,7 @@ static void binder_deferred_release(struct binder_proc *proc)
buffers++; buffers++;
} }
binder_stats.obj_deleted[BINDER_STAT_PROC]++; binder_stats_deleted(BINDER_STAT_PROC);
page_count = 0; page_count = 0;
if (proc->pages) { if (proc->pages) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment