lock stat kills lock meter for -rt (annotations)
PATCH 4/5 lock stat kills lock meter for -rt (annotations)
Rough annotations to speed up the object attachment logic.
bill
============================================================
xtensa/platform-iss/network.c +2 -0
@@ -648,6 +648,8 @@ static int iss_net_configure(int index, .have_mac = 0, }); +spin_lock_init (&lp->lock); +/* * Try all transport protocols. * Note: more protocols can be added by adding '&& !X_init(lp, eth)'.
============================================================
dcache.c +1 -1
@@ -884,7 +884,7 @@ struct dentry *d_alloc(struct dentry * patomic_set (&dentry->d_count,1 ); dentry->d_flags =DCACHE_UNHASHED ; -spin_lock_init (&dentry->d_lock); +spin_lock_init_annotated (&dentry->d_lock, &_lock_stat_d_alloc_entry); dentry->d_inode =NULL ; dentry->d_parent =NULL ; dentry->d_sb =NULL ;
============================================================
xfs/support/ktrace.c +1 -0
@@ -162,6 +162,7 @@ ktrace_enter(ASSERT (ktp !=NULL ); +spin_lock_init (&wrap_lock);//--billh /* * Grab an entry by pushing the index up to the next one. */
============================================================
linux/eventpoll.h +2 -1
@@ -15,6 +15,7 @@#define _LINUX_EVENTPOLL_H#include <linux/types.h> +#include <linux/lock_stat.h> /* Valid opcodes to issue to sys_epoll_ctl() */
@@ -55,7 +56,7 @@ static inline void eventpoll_init_file(sstatic inline void eventpoll_init_file (struct file *file) {INIT_LIST_HEAD (&file->f_ep_links); -spin_lock_init (&file->f_ep_lock); +spin_lock_init_annotated (&file->f_ep_lock, &_lock_stat_eventpoll_init_file_entry); }
============================================================
linux/wait.h +1 -1
@@ -81,7 +81,7 @@ extern void init_waitqueue_head(wait_queextern void init_waitqueue_head (wait_queue_head_t *q); -#ifdef CONFIG_LOCKDEP +#if defined(CONFIG_LOCKDEP ) || defined(CONFIG_LOCK_STAT )# define __WAIT_QUEUE_HEAD_INIT_ONSTACK (name) \ ({ init_waitqueue_head(&name); name; })# define DECLARE_WAIT_QUEUE_HEAD_ONSTACK (name) \
============================================================
main.c +1 -0
@@ -608,6 +608,7 @@ asmlinkage void __init start_kernel(void#ifdef CONFIG_PROC_FS proc_root_init ();#endif +lock_stat_sys_init ();//--billh cpuset_init ();taskstats_init_early ();delayacct_init ();
============================================================
tipc/node.c +1 -1
@@ -77,7 +77,7 @@ struct node *tipc_node_create(u32 addr)memset (n_ptr,0 ,sizeof (*n_ptr)); n_ptr->addr = addr; -spin_lock_init (&n_ptr->lock); +spin_lock_init (&n_ptr->lock);INIT_LIST_HEAD (&n_ptr->nsub); n_ptr->owner = c_ptr;tipc_cltr_attach_node (c_ptr, n_ptr);