diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/pbs/job.py | 2 | ||||
| -rwxr-xr-x | util/pbs/pbs.py | 26 | ||||
| -rwxr-xr-x | util/pbs/send.py | 29 | ||||
| -rw-r--r-- | util/stats/categories.py | 575 | ||||
| -rw-r--r-- | util/stats/output.py | 14 | ||||
| -rw-r--r-- | util/stats/profile.py | 484 | ||||
| -rwxr-xr-x | util/stats/stats.py | 10 |
7 files changed, 803 insertions, 337 deletions
diff --git a/util/pbs/job.py b/util/pbs/job.py index fb375cf5d..0fd3b4f97 100755 --- a/util/pbs/job.py +++ b/util/pbs/job.py @@ -149,7 +149,7 @@ if __name__ == '__main__': pbs_jobname = env['PBS_JOBNAME'] basedir = joinpath(rootdir, 'Base') jobname = env.setdefault('JOBNAME', pbs_jobname) - jobfile = env.setdefault('JOBFILE', joinpath(basedir, 'test.py')) + jobfile = env.setdefault('JOBFILE', joinpath(rootdir, 'Test.py')) outdir = env.setdefault('OUTPUT_DIR', joinpath(rootdir, jobname)) env['POOLJOB'] = 'True' diff --git a/util/pbs/pbs.py b/util/pbs/pbs.py index ecacbeba2..292ddf1f9 100755 --- a/util/pbs/pbs.py +++ b/util/pbs/pbs.py @@ -91,19 +91,20 @@ class MyPOpen(object): class qsub: def __init__(self): + self.afterok = None self.hold = False self.join = False self.keep_stdout = False self.keep_stderr = False - self.node_type = '' + self.node_type = None self.mail_abort = False self.mail_begin = False self.mail_end = False - self.name = '' - self.stdout = '' - self.priority = 0 - self.queue = '' - self.pbshost = '' + self.name = None + self.stdout = None + self.priority = None + self.queue = None + self.pbshost = None self.qsub = 'qsub' self.env = {} @@ -118,7 +119,7 @@ class qsub: if self.hold: self.cmd.append('-h') - if len(self.stdout): + if self.stdout: self.cmd.append('-olocalhost:' + self.stdout) if self.keep_stdout and self.keep_stderr: @@ -133,7 +134,7 @@ class qsub: if self.join: self.cmd.append('-joe') - if len(self.node_type): + if self.node_type: self.cmd.append('-lnodes=' + self.node_type) if self.mail_abort or self.mail_begin or self.mail_end: @@ -147,15 +148,18 @@ class qsub: if len(flags): self.cmd.append('-m ' + flags) - if len(self.name): + if self.name: self.cmd.append("-N%s" % self.name) - if self.priority != 0: + if self.priority: self.cmd.append('-p' + self.priority) - if len(self.queue): + if self.queue: self.cmd.append('-q' + self.queue) + if self.afterok: + self.cmd.append('-Wdepend=afterok:%s' % self.after) + self.cmd.extend(args) self.script = script self.command = ' '.join(self.cmd + [ self.script ]) diff --git a/util/pbs/send.py b/util/pbs/send.py index 51eb8425e..d04f9066b 100755 --- a/util/pbs/send.py +++ b/util/pbs/send.py @@ -82,11 +82,11 @@ Usage: -e only echo pbs command info, don't actually send the job -f force the job to run regardless of state -q <queue> submit job to the named queue - -j <jobfile> specify the jobfile (default is <basedir>/test.py) + -j <jobfile> specify the jobfile (default is <rootdir>/Test.py) -v be verbose %(progname)s [-j <jobfile>] -l [-v] <regexp> - -j <jobfile> specify the jobfile (default is <basedir>/test.py) + -j <jobfile> specify the jobfile (default is <rootdir>/Test.py) -l list job names, don't submit -v be verbose (list job parameters) @@ -96,10 +96,11 @@ Usage: try: import getopt - opts, args = getopt.getopt(sys.argv[1:], '-CRcd:efhj:lq:v') + opts, args = getopt.getopt(sys.argv[1:], '-Ccdefhj:lq:Rt:v') except getopt.GetoptError: sys.exit(usage) +depend = False clean = False onlyecho = False exprs = [] @@ -107,18 +108,19 @@ force = False listonly = False queue = '' verbose = False -jfile = 'Base/test.py' +jfile = 'Test.py' docpts = False doruns = True runflag = False +node_type = 'FAST' for opt,arg in opts: if opt == '-C': docpts = True - if opt == '-R': - runflag = True if opt == '-c': clean = True + if opt == '-d': + depend = True if opt == '-e': onlyecho = True if opt == '-f': @@ -132,6 +134,10 @@ for opt,arg in opts: listonly = True if opt == '-q': queue = arg + if opt == '-R': + runflag = True + if opt == '-t': + node_type = arg if opt == '-v': verbose = True @@ -149,6 +155,8 @@ conf = jobfile.JobFile(jfile) if not listonly and not onlyecho and isdir(conf.linkdir): if verbose: print 'Checking for outdated files in Link directory' + if not isdir(conf.basedir): + os.mkdir(conf.basedir) syncdir(conf.linkdir, conf.basedir) jobnames = {} @@ -237,6 +245,9 @@ namehack = NameHack() for job in joblist: jobdir = JobDir(joinpath(conf.rootdir, job.name)) + if depend: + cptdir = JobDir(joinpath(conf.rootdir, job.checkpoint.name)) + cptjob = cptdir.readval('.pbs_jobid') if not onlyecho: jobdir.create() @@ -249,10 +260,12 @@ for job in joblist: qsub.stdout = jobdir.file('jobout') qsub.name = job.name[:15] qsub.join = True - qsub.node_type = 'FAST' + qsub.node_type = node_type qsub.env['ROOTDIR'] = conf.rootdir qsub.env['JOBNAME'] = job.name - if len(queue): + if depend: + qsub.afterok = cptjob + if queue: qsub.queue = queue qsub.build(joinpath(progpath, 'job.py')) diff --git a/util/stats/categories.py b/util/stats/categories.py index 0c359b856..8d5d506a2 100644 --- a/util/stats/categories.py +++ b/util/stats/categories.py @@ -26,7 +26,95 @@ # # Authors: Nathan Binkert -categories = { +func_categories = { \ + # Buffer management functions + '__skb_linearize' : 'buffer', + 'skb_clone' : 'buffer', + 'skb_clone_fraglist' : 'buffer', + 'skb_seq_read' : 'buffer', + 'sock_alloc_send_skb' : 'buffer', + + # Copy functions + '__copy_user' : 'copy', + 'skb_copy_bits' : 'copy', + + # Driver functions + 'do_tx_done' : 'driver', + 'ns83820_get_drvinfo' : 'driver', + 'ns83820_get_stats' : 'driver', + 'ns83820_hard_start_xmit' : 'driver', + 'ns83820_open' : 'driver', + 'ns83820_rx_kick' : 'driver', + 'ns83820_update_stats' : 'driver', + 'ns83820_irq' : 'driver', + 'phy_intr' : 'driver', + 'rx_irq' : 'driver', + 'rx_action' : 'driver', + 'sinic_intr' : 'driver', + 'sinic_xmit' : 'driver', + 'sinic_rxskb_new' : 'driver', + + # Idle functions + 'cpu_idle' : 'idle', + + # Interrupt functions + 'do_entInt' : 'interrupt', + 'entInt' : 'interrupt', + 'handle_IRQ_event' : 'interrupt', + 'irq_exit' : 'interrupt', + + # Other functions + 'ret_from_sys_call' : 'other', + 'top' : 'other', + + # Stack functions + '__ip_conntrack_confirm' : 'stack', + '__ip_conntrack_find' : 'stack', + '__tcp_ack_snd_check' : 'stack', + '__tcp_checksum_complete_user' : 'stack', + 'dev_queue_xmit' : 'stack', + 'eth_header_cache' : 'stack', + 'ether_setup' : 'stack', + 'icmp_error' : 'stack', + 'ip_call_ra_chain' : 'stack', + 'ip_conntrack_alter_reply' : 'stack', + 'ip_conntrack_tcp_update' : 'stack', + 'ip_ct_find_helper' : 'stack', + 'ip_finish_output' : 'stack', + 'ip_finish_output2' : 'stack', + 'ip_local_deliver_finish' : 'stack', + 'ip_nat_setup_info' : 'stack', + 'ip_rcv' : 'stack', + 'ip_rcv_finish' : 'stack', + 'netif_receive_skb' : 'stack', + 'nf_log_packet' : 'stack', + 'nf_queue' : 'stack', + 'tcp_connect' : 'stack', + 'tcp_data_queue' : 'stack', + 'tcp_packet' : 'stack', + 'tcp_read_sock' : 'stack', + 'tcp_rcv_established' : 'stack', + 'tcp_recvmsg' : 'stack', + 'tcp_sendpage' : 'stack', + 'tcp_transmit_skb' : 'stack', + 'tcp_v4_do_rcv' : 'stack', + 'unregister_netdevice' : 'stack', + + # Syscall functions + 'entSys' : 'syscall', + + # User functions + 'user' : 'user', + } + +def func_categorize(symbol): + from categories import func_categories + if symbol in func_categories: + return func_categories[symbol] + return None + + +pc_categories = { 'CALL_PALrdunique_' : 'interrupt', # 'Call_Pal_Callsys' : 'interrupt', # 'Call_Pal_Rdps' : 'interrupt', # @@ -37,15 +125,15 @@ categories = { 'Call_Pal_Wrusp' : 'interrupt', # 'SHATransform': 'driver', # drivers/char/random.c, 'TRAP_INTERRUPT_10_' : 'interrupt', # - 'Trap_Dtbmiss_Single' : 'bufmgt', # - 'Trap_Dtbmiss_double' : 'bufmgt', # + 'Trap_Dtbmiss_Single' : 'buffer', # + 'Trap_Dtbmiss_double' : 'buffer', # 'Trap_Interrupt' : 'interrupt', # - 'Trap_Itbmiss' : 'bufmgt', # + 'Trap_Itbmiss' : 'buffer', # 'Trap_Unalign' : 'alignment', 'UNALIGN_NO_DISMISS' : 'alignment', 'UNALIGN_NO_DISMISS_10_' : 'alignment', - '__alloc_pages' : 'bufmgt', # mm/page_alloc.c, - '__anon_vma_link': 'bufmgt', # mm/rmap.c, include/linux/rmap.h, + '__alloc_pages' : 'buffer', # mm/page_alloc.c, + '__anon_vma_link': 'buffer', # mm/rmap.c, include/linux/rmap.h, '__bio_add_page' : 'other', # fs/bio.c, '__bitmap_weight' : 'other', # lib/bitmap.c, include/linux/bitmap.h, '__blk_put_request' : 'other', # drivers/block/ll_rw_blk.c, @@ -78,17 +166,17 @@ categories = { '__end_that_request_first' : 'other', # drivers/block/ll_rw_blk.c, '__exit_sighand': 'other', # kernel/signal.c, include/linux/sched.h, '__exit_signal': 'other', # kernel/signal.c, include/linux/sched.h, - '__filemap_copy_from_user_iovec' : 'bufmgt', # mm/filemap.c, - '__filemap_fdatawrite' : 'bufmgt', # mm/filemap.c, + '__filemap_copy_from_user_iovec' : 'buffer', # mm/filemap.c, + '__filemap_fdatawrite' : 'buffer', # mm/filemap.c, '__find_get_block' : 'other', # fs/buffer.c, include/linux/buffer_head.h, '__find_get_block_slow' : 'other', # fs/buffer.c, '__fput' : 'other', # fs/file_table.c, - '__free_pages' : 'bufmgt', # mm/page_alloc.c, - '__free_pages_ok': 'bufmgt', # mm/page_alloc.c, - '__generic_file_aio_read': 'bufmgt', # mm/filemap.c, include/linux/fs.h, + '__free_pages' : 'buffer', # mm/page_alloc.c, + '__free_pages_ok': 'buffer', # mm/page_alloc.c, + '__generic_file_aio_read': 'buffer', # mm/filemap.c, include/linux/fs.h, '__generic_unplug_device' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, '__get_free_pages' : 'other', # mm/page_alloc.c, drivers/md/raid6.h, - '__get_page_state': 'bufmgt', # mm/page_alloc.c, + '__get_page_state': 'buffer', # mm/page_alloc.c, '__get_user_4': 'other', # include/asm-i386/uaccess.h, '__get_zone_counts': 'other', # '__getblk' : 'other', # fs/buffer.c, include/linux/buffer_head.h, @@ -97,17 +185,17 @@ categories = { '__group_send_sig_info' : 'user', # kernel/signal.c, is kinda syscall '__iget' : 'other', # fs/inode.c, include/linux/fs.h, '__insert_inode_hash': 'other', # fs/inode.c, include/linux/fs.h, - '__insert_vm_struct': 'bufmgt', # mm/mmap.c, + '__insert_vm_struct': 'buffer', # mm/mmap.c, '__ip_conntrack_confirm' : 'stack', # net/ipv4/netfilter/ip_conntrack_core.c, include/linux/netfilter_ipv4/ip_conntrack_core.h, '__ip_conntrack_find' : 'stack', # net/ipv4/netfilter/ip_conntrack_core.c, '__ip_ct_find_proto' : 'stack', # net/ipv4/netfilter/ip_conntrack_core.c, include/linux/netfilter_ipv4/ip_conntrack_core.h, '__ip_route_output_key' : 'stack', # net/ipv4/route.c, - '__kfree_skb' : 'bufmgt', # net/core/skbuff.c, include/linux/skbuff.h, - '__kmalloc' : 'bufmgt', # mm/slab.c, include/linux/slab.h, - '__load_new_mm_context': 'bufmgt', + '__kfree_skb' : 'buffer', # net/core/skbuff.c, include/linux/skbuff.h, + '__kmalloc' : 'buffer', # mm/slab.c, include/linux/slab.h, + '__load_new_mm_context': 'buffer', '__lookup': 'other', # lib/radix-tree.c, '__lookup_hash': 'other', # fs/namei.c, - '__lookup_tag' : 'bufmgt', # lib/radix-tree.c, + '__lookup_tag' : 'buffer', # lib/radix-tree.c, '__make_request' : 'driver', # drivers/block/ll_rw_blk.c, drivers/block/ll_rw_blk.c, '__mark_inode_dirty' : 'other', # fs/fs-writeback.c, include/linux/fs.h, '__memcpy_aligned_up' : 'copy', # arch/alpha/lib/memcpy.c, @@ -117,31 +205,31 @@ categories = { '__mod_timer' : 'other', # kernel/timer.c, include/linux/timer.h, '__modify_IO_APIC_irq': 'interrupt', # '__net_random': 'other', # - '__page_cache_release' : 'bufmgt', # mm/swap.c, - '__pagevec_free': 'bufmgt', # mm/page_alloc.c, include/linux/pagevec.h, - '__pagevec_lru_add' : 'bufmgt', # mm/swap.c, include/linux/pagevec.h, - '__pagevec_lru_add_active': 'bufmgt', # mm/swap.c, include/linux/pagevec.h, - '__pagevec_release' : 'bufmgt', # mm/swap.c, include/linux/pagevec.h, + '__page_cache_release' : 'buffer', # mm/swap.c, + '__pagevec_free': 'buffer', # mm/page_alloc.c, include/linux/pagevec.h, + '__pagevec_lru_add' : 'buffer', # mm/swap.c, include/linux/pagevec.h, + '__pagevec_lru_add_active': 'buffer', # mm/swap.c, include/linux/pagevec.h, + '__pagevec_release' : 'buffer', # mm/swap.c, include/linux/pagevec.h, '__pollwait' : 'other', # fs/select.c, fs/select.c, '__pskb_trim_head': 'stack', # net/ipv4/tcp_output.c, '__put_task_struct': 'other', # kernel/fork.c, include/linux/sched.h, '__queue_work': 'other', # kernel/workqueue.c, - '__rb_erase_color' : 'bufmgt', # lib/rbtree.c, - '__rb_rotate_left' : 'bufmgt', # lib/rbtree.c, - '__rb_rotate_right' : 'bufmgt', # lib/rbtree.c, + '__rb_erase_color' : 'buffer', # lib/rbtree.c, + '__rb_rotate_left' : 'buffer', # lib/rbtree.c, + '__rb_rotate_right' : 'buffer', # lib/rbtree.c, '__rcu_process_callbacks': 'other', # - '__read_page_state' : 'bufmgt', # mm/page_alloc.c, include/linux/page-flags.h, + '__read_page_state' : 'buffer', # mm/page_alloc.c, include/linux/page-flags.h, '__release_sock' : 'stack', # net/core/sock.c, '__remlu' : 'other', # arch/alpha/kernel/alpha_ksyms.c, - '__remove_from_page_cache': 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, - '__remove_shared_vm_struct': 'bufmgt', # mm/mmap.c, + '__remove_from_page_cache': 'buffer', # mm/filemap.c, include/linux/pagemap.h, + '__remove_shared_vm_struct': 'buffer', # mm/mmap.c, '__remqu' : 'other', # arch/alpha/kernel/alpha_ksyms.c, - '__rmqueue' : 'bufmgt', # mm/page_alloc.c, + '__rmqueue' : 'buffer', # mm/page_alloc.c, '__scsi_done' : 'other', # drivers/scsi/scsi.c, drivers/scsi/scsi_priv.h, '__scsi_get_command' : 'other', # drivers/scsi/scsi.c, '__set_page_buffers' : 'other', # fs/buffer.c, - '__set_page_dirty_nobuffers' : 'bufmgt', # mm/page-writeback.c, include/linux/mm.h, - '__sk_stream_mem_reclaim' : 'bufmgt', # net/core/stream.c, + '__set_page_dirty_nobuffers' : 'buffer', # mm/page-writeback.c, include/linux/mm.h, + '__sk_stream_mem_reclaim' : 'buffer', # net/core/stream.c, '__sock_create': 'stack', # net/socket.c, '__strncpy_from_user' : 'copy', # include/asm-alpha/uaccess.h, '__strnlen_user': 'user', @@ -160,8 +248,8 @@ categories = { '__up_wakeup' : 'interrupt', # arch/alpha/kernel/semaphore.c, include/asm-alpha/semaphore.h, '__user_walk' : 'other', # fs/namei.c, '__vm_stat_account': 'other', # - '__vma_link': 'bufmgt', # mm/mmap.c, - '__vma_link_rb': 'bufmgt', # mm/mmap.c, include/linux/mm.h, + '__vma_link': 'buffer', # mm/mmap.c, + '__vma_link_rb': 'buffer', # mm/mmap.c, include/linux/mm.h, '__wait_on_buffer' : 'other', # fs/buffer.c, include/linux/buffer_head.h, '__wake_up' : 'other', # kernel/sched.c, '__wake_up_common' : 'other', # kernel/sched.c, @@ -172,13 +260,13 @@ categories = { 'acct_process': 'other', # kernel/acct.c, include/linux/acct.h, include/linux/acct.h, 'ack_edge_ioapic_irq': 'interrupt', # 'ack_edge_ioapic_vector': 'interrupt', # - 'activate_page' : 'bufmgt', # mm/swap.c, + 'activate_page' : 'buffer', # mm/swap.c, 'activate_task' : 'other', # kernel/sched.c, 'add_disk_randomness' : 'other', # drivers/char/random.c, include/linux/genhd.h, 'add_interrupt_randomness': 'driver', # drivers/char/random.c, include/linux/random.h, 'add_timer_randomness' : 'driver', # drivers/char/random.c, - 'add_to_page_cache' : 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, - 'add_to_page_cache_lru' : 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, + 'add_to_page_cache' : 'buffer', # mm/filemap.c, include/linux/pagemap.h, + 'add_to_page_cache_lru' : 'buffer', # mm/filemap.c, include/linux/pagemap.h, 'add_wait_queue' : 'other', # kernel/fork.c, 'add_wait_queue_exclusive' : 'other', # kernel/fork.c, 'aligned' : 'other', # @@ -187,16 +275,16 @@ categories = { 'alloc_fd_array': 'other', # fs/file.c, include/linux/file.h, 'alloc_inode' : 'other', # fs/inode.c, 'alloc_pidmap': 'other', # kernel/pid.c, include/linux/pid.h, - 'alloc_skb' : 'bufmgt', # net/core/skbuff.c, include/linux/skbuff.h, - 'alloc_slabmgmt' : 'bufmgt', # mm/slab.c, + 'alloc_skb' : 'buffer', # net/core/skbuff.c, include/linux/skbuff.h, + 'alloc_slabmgmt' : 'buffer', # mm/slab.c, 'alpha_switch_to' : 'other', # include/asm-alpha/system.h, - 'anon_vma_link': 'bufmgt', # mm/rmap.c, include/linux/rmap.h, include/linux/rmap.h, - 'anon_vma_prepare': 'bufmgt', # mm/rmap.c, include/linux/rmap.h, include/linux/rmap.h, - 'anon_vma_unlink': 'bufmgt', # mm/rmap.c, include/linux/rmap.h, + 'anon_vma_link': 'buffer', # mm/rmap.c, include/linux/rmap.h, include/linux/rmap.h, + 'anon_vma_prepare': 'buffer', # mm/rmap.c, include/linux/rmap.h, include/linux/rmap.h, + 'anon_vma_unlink': 'buffer', # mm/rmap.c, include/linux/rmap.h, 'apache': 'other', # 'apic_timer_interrupt': 'interrupt', # include/asm-i386/hw_irq.h, - 'arch_get_unmapped_area': 'bufmgt', - 'arch_get_unmapped_area_1': 'bufmgt', + 'arch_get_unmapped_area': 'buffer', + 'arch_get_unmapped_area_1': 'buffer', 'arch_get_unmapped_area_topdown': 'other', # 'arch_pick_mmap_layout': 'other', # 'arch_unmap_area_topdown': 'other', # @@ -241,9 +329,9 @@ categories = { 'auth_domain_drop' : 'other', # net/sunrpc/svcauth.c, 'auth_domain_put' : 'other', # net/sunrpc/svcauth.c, include/linux/sunrpc/svcauth.h, 'autoremove_wake_function' : 'other', # kernel/fork.c, include/linux/wait.h, - 'bad_range' : 'bufmgt', # mm/page_alloc.c, - 'balance_dirty_pages' : 'bufmgt', # mm/page-writeback.c, - 'balance_dirty_pages_ratelimited' : 'bufmgt', # mm/page-writeback.c, include/linux/writeback.h, + 'bad_range' : 'buffer', # mm/page_alloc.c, + 'balance_dirty_pages' : 'buffer', # mm/page-writeback.c, + 'balance_dirty_pages_ratelimited' : 'buffer', # mm/page-writeback.c, include/linux/writeback.h, 'basename': 'other', # 'bash': 'other', # 'batch_entropy_store' : 'interrupt', # drivers/char/random.c, include/linux/random.h, @@ -264,7 +352,7 @@ categories = { 'blk_hw_contig_segment' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'blk_phys_contig_segment' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'blk_plug_device' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, - 'blk_queue_bounce' : 'bufmgt', # mm/highmem.c, include/linux/blkdev.h, + 'blk_queue_bounce' : 'buffer', # mm/highmem.c, include/linux/blkdev.h, 'blk_recount_segments' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'blk_remove_plug' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'blk_rq_map_sg' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, @@ -276,18 +364,18 @@ categories = { 'block_write_full_page': 'other', # fs/buffer.c, include/linux/buffer_head.h, 'bmap': 'other', # fs/jfs/jfs_dmap.h, fs/inode.c, include/linux/fs.h, 'buffer_insert_list' : 'other', # fs/buffer.c, include/linux/buffer_head.h, - 'buffered_rmqueue' : 'bufmgt', # mm/page_alloc.c, - 'cache_alloc_refill' : 'bufmgt', # mm/slab.c, + 'buffered_rmqueue' : 'buffer', # mm/page_alloc.c, + 'cache_alloc_refill' : 'buffer', # mm/slab.c, 'cache_check' : 'other', # net/sunrpc/cache.c, include/linux/sunrpc/cache.h, - 'cache_flusharray' : 'bufmgt', # mm/slab.c, - 'cache_grow' : 'bufmgt', # mm/slab.c, - 'cache_init_objs' : 'bufmgt', # mm/slab.c, - 'cache_reap': 'bufmgt', # mm/slab.c, + 'cache_flusharray' : 'buffer', # mm/slab.c, + 'cache_grow' : 'buffer', # mm/slab.c, + 'cache_init_objs' : 'buffer', # mm/slab.c, + 'cache_reap': 'buffer', # mm/slab.c, 'cached_lookup': 'other', # fs/namei.c, 'call_rcu' : 'other', # kernel/rcupdate.c, - 'can_share_swap_page': 'bufmgt', # mm/swapfile.c, include/linux/swap.h, include/linux/swap.h, - 'can_vma_merge_after': 'bufmgt', # mm/mmap.c, - 'can_vma_merge_before': 'bufmgt', # mm/mmap.c, + 'can_share_swap_page': 'buffer', # mm/swapfile.c, include/linux/swap.h, include/linux/swap.h, + 'can_vma_merge_after': 'buffer', # mm/mmap.c, + 'can_vma_merge_before': 'buffer', # mm/mmap.c, 'capable': 'other', 'cascade' : 'interrupt', # kernel/timer.c, 'cat': 'other', # @@ -297,9 +385,9 @@ categories = { 'chrdev_open': 'other', # fs/char_dev.c, include/linux/fs.h, 'cleanup_rbuf' : 'stack', # net/ipv4/tcp.c, 'clear_inode' : 'other', # fs/inode.c, include/linux/fs.h, - 'clear_page' : 'bufmgt', # include/asm-alpha/page.h, - 'clear_page_dirty_for_io' : 'bufmgt', # mm/page-writeback.c, include/linux/mm.h, - 'clear_page_tables': 'bufmgt', # mm/memory.c, include/linux/mm.h, + 'clear_page' : 'buffer', # include/asm-alpha/page.h, + 'clear_page_dirty_for_io' : 'buffer', # mm/page-writeback.c, include/linux/mm.h, + 'clear_page_tables': 'buffer', # mm/memory.c, include/linux/mm.h, 'clear_queue_congested' : 'other', # drivers/block/ll_rw_blk.c, 'clear_user': 'other', # include/asm-alpha/uaccess.h, include/asm-i386/uaccess.h, 'clock_panelapplet.so': 'other', # @@ -317,14 +405,14 @@ categories = { 'copy_mm': 'other', # kernel/fork.c, 'copy_namespace': 'other', # fs/namespace.c, include/linux/namespace.h, 'copy_page': 'copy', - 'copy_page_range': 'bufmgt', # mm/memory.c, include/linux/mm.h, + 'copy_page_range': 'buffer', # mm/memory.c, include/linux/mm.h, 'copy_process': 'other', # kernel/fork.c, include/linux/sched.h, 'copy_semundo': 'other', # ipc/sem.c, include/linux/sem.h, 'copy_strings': 'other', # fs/exec.c, include/linux/binfmts.h, 'copy_strings_kernel': 'other', # fs/exec.c, include/linux/binfmts.h, 'copy_thread': 'syscall', # arch/alpha/kernel/process.c, include/linux/sched.h, 'copy_to_user': 'copy', # include/asm-alpha/uaccess.h, include/asm-i386/uaccess.h, - 'copy_vma': 'bufmgt', # mm/mmap.c, include/linux/mm.h, + 'copy_vma': 'buffer', # mm/mmap.c, include/linux/mm.h, 'count': 'driver', # fs/exec.c, init/initramfs.c, drivers/char/serial_tx3912.c, drivers/char/rocket.c, drivers/isdn/hardware/eicon/diva_didd.c, drivers/isdn/hardware/eicon/divasmain.c, drivers/isdn/hardware/eicon/divasmain.c, drivers/isdn/hardware/eicon/capimain.c, drivers/isdn/hardware/eicon/divasi.c, drivers/isdn/hardware/eicon/divasi.c, drivers/isdn/hardware/eicon/divasi.c, drivers/isdn/hardware/eicon/divasi.c, drivers/isdn/hardware/eicon/divasi.c, drivers/isdn/hardware/eicon/divamnt.c, drivers/isdn/hardware/eicon/divamnt.c, drivers/isdn/hardware/eicon/divamnt.c, drivers/isdn/hardware/eicon/divamnt.c, drivers/isdn/hardware/eicon/divamnt.c, drivers/media/video/w9966.c, drivers/media/video/w9966.c, 'count_open_files': 'other', # kernel/fork.c, 'cp_new_stat' : 'other', # fs/stat.c, @@ -366,7 +454,7 @@ categories = { 'destroy_context': 'interrupt', # include/asm-alpha/mmu_context.h, include/asm-i386/mmu_context.h, 'destroy_inode' : 'other', # fs/inode.c, include/linux/fs.h, 'detach_pid': 'other', # kernel/pid.c, - 'detach_vmas_to_be_unmapped': 'bufmgt', # mm/mmap.c, + 'detach_vmas_to_be_unmapped': 'buffer', # mm/mmap.c, 'dev_queue_xmit' : 'stack', # net/core/dev.c, include/linux/netdevice.h, 'dev_shutdown' : 'stack', # net/sched/sch_generic.c, 'dev_watchdog': 'stack', # net/sched/sch_generic.c, @@ -376,9 +464,9 @@ categories = { 'dnotify_flush' : 'other', # fs/dnotify.c, include/linux/dnotify.h, 'dnotify_parent' : 'other', # fs/dnotify.c, include/linux/dnotify.h, 'do_IRQ': 'driver', # drivers/s390/cio/cio.c, - 'do_anonymous_page' : 'bufmgt', # mm/memory.c, + 'do_anonymous_page' : 'buffer', # mm/memory.c, 'do_bindings' : 'stack', # net/ipv4/netfilter/ip_nat_core.c, include/linux/netfilter_ipv4/ip_nat_core.h, - 'do_brk': 'bufmgt', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, + 'do_brk': 'buffer', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, 'do_csum_partial_copy_from_user' : 'copy', # arch/alpha/lib/csum_partial_copy.c, 'do_entInt' : 'interrupt', # arch/alpha/kernel/irq_alpha.c, 'do_entUna': 'alignment', @@ -387,21 +475,21 @@ categories = { 'do_fcntl' : 'user', # fs/fcntl.c, used to be syscall` 'do_fork': 'other', # kernel/fork.c, include/linux/sched.h, 'do_futex': 'other', # kernel/futex.c, include/linux/futex.h, - 'do_generic_mapping_read': 'bufmgt', # mm/filemap.c, include/linux/fs.h, + 'do_generic_mapping_read': 'buffer', # mm/filemap.c, include/linux/fs.h, 'do_gettimeofday' : 'user', # arch/alpha/kernel/time.c, include/linux/time.h, used to by syscall 'do_group_exit': 'other', # kernel/exit.c, include/linux/sched.h, - 'do_invalidatepage': 'bufmgt', # mm/truncate.c, + 'do_invalidatepage': 'buffer', # mm/truncate.c, 'do_lookup' : 'user', # fs/namei.c, used to by syscall - 'do_mmap_pgoff': 'bufmgt', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, + 'do_mmap_pgoff': 'buffer', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, 'do_mpage_readpage': 'other', # fs/mpage.c, - 'do_mremap': 'bufmgt', # mm/mremap.c, - 'do_munmap': 'bufmgt', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, + 'do_mremap': 'buffer', # mm/mremap.c, + 'do_munmap': 'buffer', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, 'do_no_page' : 'user', # mm/memory.c, used to by syscall 'do_nosym': 'other', # 'do_notify_parent': 'other', # kernel/signal.c, include/linux/sched.h, 'do_notify_resume': 'interrupt', # arch/alpha/kernel/signal.c, 'do_osf_sigprocmask' : 'user', # arch/alpha/kernel/signal.c, used to by syscall - 'do_page_cache_readahead': 'bufmgt', # mm/readahead.c, include/linux/mm.h, + 'do_page_cache_readahead': 'buffer', # mm/readahead.c, include/linux/mm.h, 'do_page_fault' : 'user', # arch/alpha/mm/fault.c, used to by syscall 'do_pipe': 'syscall', # fs/pipe.c, arch/alpha/kernel/osf_sys.c, include/linux/fs.h, 'do_poll' : 'user', # fs/select.c, drivers/macintosh/apm_emu.c, used to by syscall @@ -424,15 +512,15 @@ categories = { 'do_truncate': 'other', # fs/open.c, include/linux/fs.h, 'do_tx_done' : 'driver', # drivers/net/ns83820.c, 'do_wait': 'other', # - 'do_wp_page': 'bufmgt', # mm/memory.c, - 'do_writepages' : 'bufmgt', # mm/page-writeback.c, include/linux/writeback.h, + 'do_wp_page': 'buffer', # mm/memory.c, + 'do_writepages' : 'buffer', # mm/page-writeback.c, include/linux/writeback.h, 'done' : 'other', # drivers/usb/gadget/net2280.c, drivers/usb/gadget/goku_udc.c, drivers/usb/gadget/pxa2xx_udc.c, drivers/scsi/aha152x.c, drivers/scsi/aha152x.c, include/linux/wavefront.h, 'dp264_disable_irq' : 'interrupt', # arch/alpha/kernel/sys_dp264.c, 'dp264_enable_irq' : 'interrupt', # arch/alpha/kernel/sys_dp264.c, 'dp264_end_irq' : 'interrupt', # arch/alpha/kernel/sys_dp264.c, 'dp264_srm_device_interrupt' : 'interrupt', # arch/alpha/kernel/sys_dp264.c, 'dput' : 'other', # fs/dcache.c, include/linux/dcache.h, - 'drain_array_locked': 'bufmgt', # mm/slab.c, mm/slab.c, + 'drain_array_locked': 'buffer', # mm/slab.c, mm/slab.c, 'drive_stat_acct' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'drop_buffers': 'other', # fs/buffer.c, 'drop_key_refs': 'other', # kernel/futex.c, @@ -493,7 +581,7 @@ categories = { 'end_edge_ioapic_vector': 'other', # include/asm-i386/io_apic.h, 'end_level_ioapic_irq': 'interrupt', # 'end_level_ioapic_vector': 'interrupt', # - 'end_page_writeback' : 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, + 'end_page_writeback' : 'buffer', # mm/filemap.c, include/linux/pagemap.h, 'end_that_request_chunk' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'end_that_request_first': 'driver', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'end_that_request_last' : 'other', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, @@ -506,14 +594,14 @@ categories = { 'error_code': 'other', # 'eth_header' : 'stack', # net/ethernet/eth.c, include/linux/etherdevice.h, 'eth_type_trans' : 'stack', # net/ethernet/eth.c, include/linux/etherdevice.h, - 'ev5_flush_tlb_current_page': 'bufmgt', + 'ev5_flush_tlb_current_page': 'buffer', 'ev5_switch_mm' : 'other', # include/asm-alpha/mmu_context.h, 'eventpoll_init_file' : 'other', # fs/eventpoll.c, include/linux/eventpoll.h, 'exec_mmap': 'other', # fs/exec.c, 'exim4': 'other', # 'exit_aio': 'other', # fs/aio.c, 'exit_itimers': 'other', # kernel/posix-timers.c, include/linux/sched.h, - 'exit_mmap': 'bufmgt', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, + 'exit_mmap': 'buffer', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, 'exit_notify': 'other', # kernel/exit.c, 'exit_sem': 'other', # ipc/sem.c, include/linux/sem.h, include/linux/sem.h, 'exp_find_key' : 'other', # fs/nfsd/export.c, include/linux/nfsd/export.h, @@ -521,7 +609,7 @@ categories = { 'exp_readunlock' : 'other', # fs/nfsd/export.c, include/linux/nfsd/export.h, 'expand_fd_array': 'other', # fs/file.c, include/linux/file.h, 'expand_files': 'other', # fs/fcntl.c, - 'expand_stack': 'bufmgt', # mm/mmap.c, include/linux/mm.h, + 'expand_stack': 'buffer', # mm/mmap.c, include/linux/mm.h, 'expkey_put' : 'other', # fs/nfsd/export.c, include/linux/nfsd/export.h, 'export_decode_fh' : 'other', # fs/exportfs/expfs.c, 'export_iget' : 'other', # fs/exportfs/expfs.c, @@ -559,11 +647,11 @@ categories = { 'file_ioctl': 'other', # fs/ioctl.c, 'file_kill' : 'other', # fs/file_table.c, include/linux/fs.h, 'file_move': 'other', # fs/file_table.c, include/linux/fs.h, - 'file_ra_state_init': 'bufmgt', # mm/readahead.c, include/linux/fs.h, - 'file_read_actor': 'bufmgt', # mm/filemap.c, include/linux/fs.h, - 'filemap_fdatawait' : 'bufmgt', # mm/filemap.c, include/linux/fs.h, - 'filemap_fdatawrite' : 'bufmgt', # mm/filemap.c, include/linux/fs.h, - 'filemap_nopage': 'bufmgt', # mm/filemap.c, include/linux/mm.h, + 'file_ra_state_init': 'buffer', # mm/readahead.c, include/linux/fs.h, + 'file_read_actor': 'buffer', # mm/filemap.c, include/linux/fs.h, + 'filemap_fdatawait' : 'buffer', # mm/filemap.c, include/linux/fs.h, + 'filemap_fdatawrite' : 'buffer', # mm/filemap.c, include/linux/fs.h, + 'filemap_nopage': 'buffer', # mm/filemap.c, include/linux/mm.h, 'filesystems_read_proc': 'other', # fs/proc/proc_misc.c, 'filp_close' : 'other', # fs/open.c, include/linux/fs.h, 'filp_open' : 'other', # fs/open.c, include/linux/fs.h, @@ -571,24 +659,24 @@ categories = { 'find_busiest_group' : 'other', # kernel/sched.c, 'find_dcookie': 'other', # fs/dcookies.c, 'find_exported_dentry' : 'other', # fs/exportfs/expfs.c, fs/nfsd/export.c, - 'find_extend_vma': 'bufmgt', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, - 'find_get_page' : 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, - 'find_get_pages': 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, - 'find_get_pages_tag' : 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, + 'find_extend_vma': 'buffer', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, + 'find_get_page' : 'buffer', # mm/filemap.c, include/linux/pagemap.h, + 'find_get_pages': 'buffer', # mm/filemap.c, include/linux/pagemap.h, + 'find_get_pages_tag' : 'buffer', # mm/filemap.c, include/linux/pagemap.h, 'find_inode_fast' : 'other', # fs/inode.c, 'find_inode_number' : 'other', # fs/dcache.c, include/linux/fs.h, - 'find_lock_page' : 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, - 'find_mergeable_anon_vma': 'bufmgt', # mm/mmap.c, include/linux/mm.h, + 'find_lock_page' : 'buffer', # mm/filemap.c, include/linux/pagemap.h, + 'find_mergeable_anon_vma': 'buffer', # mm/mmap.c, include/linux/mm.h, 'find_nat_proto' : 'stack', # net/ipv4/netfilter/ip_nat_core.c, include/linux/netfilter_ipv4/ip_nat_protocol.h, 'find_next_zero_bit': 'other', # include/asm-alpha/bitops.h, include/asm-i386/bitops.h, - 'find_or_create_page' : 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, + 'find_or_create_page' : 'buffer', # mm/filemap.c, include/linux/pagemap.h, 'find_pid' : 'user', # kernel/pid.c, used to be syscall 'find_snap_client': 'stack', # net/802/psnap.c, 'find_task_by_pid' : 'user', # kernel/pid.c, include/linux/sched.h, used to be syscall 'find_task_by_pid_type': 'other', # - 'find_vma' : 'bufmgt', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, used to be syscall - 'find_vma_prepare': 'bufmgt', # mm/mmap.c, - 'find_vma_prev': 'bufmgt', # mm/mmap.c, include/linux/mm.h, + 'find_vma' : 'buffer', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, used to be syscall + 'find_vma_prepare': 'buffer', # mm/mmap.c, + 'find_vma_prev': 'buffer', # mm/mmap.c, include/linux/mm.h, 'finish_task_switch' : 'other', # kernel/sched.c, used to be syscall 'finish_wait' : 'other', # kernel/fork.c, used to be syscall 'flush_old_exec': 'other', # fs/exec.c, include/linux/binfmts.h, @@ -599,15 +687,15 @@ categories = { 'follow_mount' : 'user', # fs/namei.c, used to be syscall 'found' : 'other', # sound/oss/forte.c, scripts/kconfig/gconf.c, drivers/net/fec.c, drivers/scsi/ibmmca.c, drivers/scsi/fd_mcs.c, 'fput' : 'user', # fs/file_table.c, used to be syscall - 'free_block' : 'bufmgt', # mm/slab.c, drivers/char/drm/radeon_mem.c, mm/slab.c, + 'free_block' : 'buffer', # mm/slab.c, drivers/char/drm/radeon_mem.c, mm/slab.c, 'free_buffer_head': 'other', # fs/buffer.c, include/linux/buffer_head.h, 'free_fd_array': 'other', # fs/file.c, include/linux/file.h, - 'free_hot_cold_page' : 'bufmgt', # mm/page_alloc.c, - 'free_hot_page' : 'bufmgt', # mm/page_alloc.c, - 'free_page_and_swap_cache': 'bufmgt', # mm/swap_state.c, include/linux/swap.h, include/linux/swap.h, - 'free_pages' : 'bufmgt', # mm/page_alloc.c, drivers/char/drm/drm_memory_debug.h, drivers/md/raid6.h, drivers/char/drm/drmP.h, - 'free_pages_bulk': 'bufmgt', # mm/page_alloc.c, - 'free_pgtables': 'bufmgt', # mm/mmap.c, + 'free_hot_cold_page' : 'buffer', # mm/page_alloc.c, + 'free_hot_page' : 'buffer', # mm/page_alloc.c, + 'free_page_and_swap_cache': 'buffer', # mm/swap_state.c, include/linux/swap.h, include/linux/swap.h, + 'free_pages' : 'buffer', # mm/page_alloc.c, drivers/char/drm/drm_memory_debug.h, drivers/md/raid6.h, drivers/char/drm/drmP.h, + 'free_pages_bulk': 'buffer', # mm/page_alloc.c, + 'free_pgtables': 'buffer', # mm/mmap.c, 'free_pidmap': 'other', # kernel/pid.c, 'free_task': 'other', # kernel/fork.c, 'free_uid' : 'other', # kernel/user.c, include/linux/sched.h, @@ -620,12 +708,12 @@ categories = { 'generic_commit_write' : 'user', # fs/buffer.c, include/linux/buffer_head.h, used to be syscall 'generic_delete_inode': 'other', # fs/inode.c, include/linux/fs.h, 'generic_drop_inode' : 'user', # fs/inode.c, used to be syscall - 'generic_file_aio_read': 'bufmgt', # mm/filemap.c, include/linux/fs.h, - 'generic_file_aio_write': 'bufmgt', # mm/filemap.c, include/linux/fs.h, + 'generic_file_aio_read': 'buffer', # mm/filemap.c, include/linux/fs.h, + 'generic_file_aio_write': 'buffer', # mm/filemap.c, include/linux/fs.h, 'generic_file_aio_write_nolock' : 'user', # mm/filemap.c, include/linux/fs.h, used to be syscall 'generic_file_buffered_write': 'other', # 'generic_file_llseek': 'other', # fs/read_write.c, include/linux/fs.h, - 'generic_file_mmap': 'bufmgt', # mm/filemap.c, include/linux/fs.h, + 'generic_file_mmap': 'buffer', # mm/filemap.c, include/linux/fs.h, 'generic_file_open' : 'user', # fs/open.c, include/linux/fs.h, used to be syscall 'generic_file_write' : 'user', # mm/filemap.c, include/linux/fs.h, used to be syscall 'generic_file_write_nolock' : 'user', # mm/filemap.c, include/linux/fs.h, used to be syscall @@ -636,7 +724,7 @@ categories = { 'generic_unplug_device' : 'driver', # drivers/block/ll_rw_blk.c, include/linux/blkdev.h, 'get_conntrack_index' : 'stack', # net/ipv4/netfilter/ip_conntrack_proto_tcp.c, 'get_device' : 'driver', # drivers/base/core.c, include/linux/device.h, - 'get_dirty_limits' : 'bufmgt', # mm/page-writeback.c, + 'get_dirty_limits' : 'buffer', # mm/page-writeback.c, 'get_empty_filp' : 'other', # fs/file_table.c, include/linux/fs.h, 'get_free_idx': 'interrupt', # 'get_futex_key': 'other', # kernel/futex.c, @@ -645,8 +733,8 @@ categories = { 'get_new_inode_fast': 'other', # fs/inode.c, 'get_object' : 'other', # fs/exportfs/expfs.c, 'get_offset_pmtmr': 'interrupt', # - 'get_one_pte_map_nested': 'bufmgt', # mm/mremap.c, - 'get_page_state': 'bufmgt', # mm/page_alloc.c, include/linux/page-flags.h, + 'get_one_pte_map_nested': 'buffer', # mm/mremap.c, + 'get_page_state': 'buffer', # mm/page_alloc.c, include/linux/page-flags.h, 'get_pipe_inode': 'other', # fs/pipe.c, 'get_request' : 'other', # drivers/block/ll_rw_blk.c, 'get_sample_stats' : 'stack', # net/core/dev.c, @@ -654,12 +742,12 @@ categories = { 'get_task_mm': 'other', # include/linux/sched.h, 'get_tuple' : 'driver', # net/ipv4/netfilter/ip_conntrack_core.c, drivers/isdn/hisax/elsa_cs.c, drivers/isdn/hisax/teles_cs.c, drivers/isdn/hisax/avma1_cs.c, drivers/isdn/hardware/avm/avm_cs.c, drivers/bluetooth/bt3c_cs.c, drivers/bluetooth/btuart_cs.c, drivers/bluetooth/dtl1_cs.c, include/linux/netfilter_ipv4/ip_conntrack_core.h, 'get_unique_tuple' : 'stack', # net/ipv4/netfilter/ip_nat_core.c, - 'get_unmapped_area': 'bufmgt', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, + 'get_unmapped_area': 'buffer', # mm/mmap.c, mm/nommu.c, include/linux/mm.h, 'get_unused_fd' : 'other', # fs/open.c, include/linux/file.h, used to be syscall 'get_vmalloc_info': 'other', # fs/proc/proc_misc.c, 'get_write_access' : 'other', # fs/namei.c, include/linux/fs.h, used to be syscall 'get_writeback_state' : 'other', # mm/page-writeback.c, used to be syscall - 'get_zone_counts': 'bufmgt', # mm/page_alloc.c, include/linux/mmzone.h, + 'get_zone_counts': 'buffer', # mm/page_alloc.c, include/linux/mmzone.h, 'getname' : 'other', # fs/namei.c, include/linux/fs.h, used to be syscall 'getnstimeofday': 'other', # 'getrusage': 'other', # kernel/sys.c, kernel/exit.c, @@ -715,7 +803,7 @@ categories = { 'inode_sub_bytes' : 'other', # fs/stat.c, include/linux/fs.h, 'inode_times_differ' : 'other', # fs/inode.c, 'inode_update_time' : 'other', # fs/inode.c, include/linux/fs.h, - 'insert_vm_struct': 'bufmgt', # mm/mmap.c, include/linux/mm.h, + 'insert_vm_struct': 'buffer', # mm/mmap.c, include/linux/mm.h, 'install_arg_page': 'other', # fs/exec.c, include/linux/mm.h, 'internal_add_timer' : 'other', # kernel/timer.c, 'invalid_dpte_no_dismiss_10_' : 'interrupt', # @@ -795,19 +883,19 @@ categories = { 'kded_kmilod.so': 'other', # 'kdeinit': 'other', # 'kernel_read': 'other', # fs/exec.c, include/linux/fs.h, - 'kfree' : 'bufmgt', # mm/slab.c, include/linux/slab.h, - 'kfree_skbmem' : 'bufmgt', # net/core/skbuff.c, include/linux/skbuff.h, + 'kfree' : 'buffer', # mm/slab.c, include/linux/slab.h, + 'kfree_skbmem' : 'buffer', # net/core/skbuff.c, include/linux/skbuff.h, 'kill_fasync': 'other', # fs/fcntl.c, include/linux/fs.h, 'kill_proc_info' : 'other', # kernel/signal.c, include/linux/sched.h, 'kill_something_info' : 'other', # kernel/signal.c, - 'kmap': 'bufmgt', # include/asm-i386/highmem.h, - 'kmap_atomic': 'bufmgt', # include/linux/highmem.h, include/asm-i386/highmem.h, - 'kmap_high': 'bufmgt', # mm/highmem.c, - 'kmem_cache_alloc' : 'bufmgt', # mm/slab.c, include/linux/slab.h, - 'kmem_cache_free' : 'bufmgt', # mm/slab.c, include/linux/slab.h, - 'kmem_flagcheck' : 'bufmgt', # mm/slab.c, - 'kmem_freepages' : 'bufmgt', # mm/slab.c, - 'kmem_getpages' : 'bufmgt', # mm/slab.c, + 'kmap': 'buffer', # include/asm-i386/highmem.h, + 'kmap_atomic': 'buffer', # include/linux/highmem.h, include/asm-i386/highmem.h, + 'kmap_high': 'buffer', # mm/highmem.c, + 'kmem_cache_alloc' : 'buffer', # mm/slab.c, include/linux/slab.h, + 'kmem_cache_free' : 'buffer', # mm/slab.c, include/linux/slab.h, + 'kmem_flagcheck' : 'buffer', # mm/slab.c, + 'kmem_freepages' : 'buffer', # mm/slab.c, + 'kmem_getpages' : 'buffer', # mm/slab.c, 'kobject_get' : 'other', # lib/kobject.c, include/linux/kobject.h, 'kobject_put' : 'other', # lib/kobject.c, include/linux/kobject.h, 'kref_get': 'other', # lib/kref.c, include/linux/kref.h, @@ -815,9 +903,9 @@ categories = { 'ksoftirqd' : 'interrupt', # kernel/softirq.c, 'ksysguardd': 'other', # 'kthread_should_stop' : 'other', # kernel/kthread.c, include/linux/kthread.h, - 'kunmap': 'bufmgt', # include/linux/highmem.h, include/asm-i386/highmem.h, - 'kunmap_atomic': 'bufmgt', # include/linux/highmem.h, include/asm-i386/highmem.h, - 'kunmap_high': 'bufmgt', # mm/highmem.c, + 'kunmap': 'buffer', # include/linux/highmem.h, include/asm-i386/highmem.h, + 'kunmap_atomic': 'buffer', # include/linux/highmem.h, include/asm-i386/highmem.h, + 'kunmap_high': 'buffer', # mm/highmem.c, 'kwrapper': 'other', # 'ld-2.3.2.so': 'other', # 'lease_get_mtime' : 'other', # fs/locks.c, include/linux/fs.h, @@ -939,21 +1027,21 @@ categories = { 'lookup_mnt' : 'other', # fs/namespace.c, include/linux/dcache.h, 'loop' : 'interrupt', # 'loopback_xmit': 'driver', - 'lru_add_drain' : 'bufmgt', # mm/swap.c, include/linux/swap.h, - 'lru_cache_add' : 'bufmgt', # mm/swap.c, - 'lru_cache_add_active': 'bufmgt', # mm/swap.c, + 'lru_add_drain' : 'buffer', # mm/swap.c, include/linux/swap.h, + 'lru_cache_add' : 'buffer', # mm/swap.c, + 'lru_cache_add_active': 'buffer', # mm/swap.c, 'lru_put_front' : 'other', # fs/nfsd/nfscache.c, 'ls': 'driver', # drivers/fc4/fc.c, 'mail': 'other', # - 'mapping_tagged' : 'bufmgt', # mm/page-writeback.c, include/linux/fs.h, + 'mapping_tagged' : 'buffer', # mm/page-writeback.c, include/linux/fs.h, 'mark_buffer_dirty' : 'other', # fs/buffer.c, 'mark_buffer_dirty_inode' : 'other', # fs/buffer.c, include/linux/buffer_head.h, 'mark_offset_pmtmr': 'interrupt', # - 'mark_page_accessed' : 'bufmgt', # mm/swap.c, + 'mark_page_accessed' : 'buffer', # mm/swap.c, 'mask_and_ack_level_ioapic_vector': 'interrupt', # include/asm-i386/io_apic.h, 'math_state_restore': 'interrupt', # 'mawk': 'other', # - 'max_sane_readahead': 'bufmgt', # mm/readahead.c, include/linux/mm.h, + 'max_sane_readahead': 'buffer', # mm/readahead.c, include/linux/mm.h, 'max_select_fd': 'other', # fs/select.c, 'may_open': 'other', # fs/namei.c, include/linux/fs.h, 'memcmp' : 'copy', # lib/string.c, @@ -963,20 +1051,20 @@ categories = { 'memcpy_toiovec' : 'copy', # net/core/iovec.c, include/linux/socket.h, 'meminfo_read_proc': 'other', # fs/proc/proc_misc.c, 'memmove' : 'copy', # lib/string.c, include/asm-alpha/string.h, - 'mempool_alloc' : 'bufmgt', # mm/mempool.c, include/linux/mempool.h, - 'mempool_alloc_slab' : 'bufmgt', # mm/mempool.c, include/linux/mempool.h, - 'mempool_free' : 'bufmgt', # mm/mempool.c, include/linux/mempool.h, - 'mempool_free_slab' : 'bufmgt', # mm/mempool.c, include/linux/mempool.h, + 'mempool_alloc' : 'buffer', # mm/mempool.c, include/linux/mempool.h, + 'mempool_alloc_slab' : 'buffer', # mm/mempool.c, include/linux/mempool.h, + 'mempool_free' : 'buffer', # mm/mempool.c, include/linux/mempool.h, + 'mempool_free_slab' : 'buffer', # mm/mempool.c, include/linux/mempool.h, 'memscan' : 'copy', # lib/string.c, 'mkdir': 'other', # - 'mm_alloc': 'bufmgt', # kernel/fork.c, include/linux/sched.h, + 'mm_alloc': 'buffer', # kernel/fork.c, include/linux/sched.h, 'mm_init': 'driver', # drivers/block/umem.c, kernel/fork.c, 'mm_release': 'other', # kernel/fork.c, include/linux/sched.h, 'mmput': 'other', # kernel/fork.c, include/linux/sched.h, 'mod_timer' : 'other', # kernel/timer.c, include/linux/timer.h, 'move_addr_to_user' : 'copy', # net/socket.c, include/linux/socket.h, - 'move_one_page': 'bufmgt', # mm/mremap.c, - 'move_vma': 'bufmgt', # mm/mremap.c, + 'move_one_page': 'buffer', # mm/mremap.c, + 'move_vma': 'buffer', # mm/mremap.c, 'mpage_alloc' : 'other', # fs/mpage.c, 'mpage_bio_submit' : 'other', # fs/mpage.c, 'mpage_end_io_write' : 'other', # fs/mpage.c, @@ -1034,7 +1122,7 @@ categories = { 'notifier_call_chain': 'other', # kernel/sys.c, include/linux/notifier.h, 'notify_change': 'other', # fs/attr.c, include/linux/fs.h, 'nr_blockdev_pages': 'other', # fs/block_dev.c, include/linux/blkdev.h, - 'nr_free_pages': 'bufmgt', # mm/page_alloc.c, include/linux/swap.h, + 'nr_free_pages': 'buffer', # mm/page_alloc.c, include/linux/swap.h, 'nr_running': 'other', # kernel/sched.c, include/linux/sched.h, 'ns83820': 'driver', 'ns83820_do_isr' : 'driver', @@ -1059,17 +1147,17 @@ categories = { 'osf_sigprocmask' : 'other', # 'osync_buffers_list' : 'other', # fs/buffer.c, 'padzero': 'other', # fs/binfmt_elf.c, - 'page_add_anon_rmap' : 'bufmgt', # mm/rmap.c, include/linux/rmap.h, - 'page_add_file_rmap': 'bufmgt', # mm/rmap.c, include/linux/rmap.h, - 'page_address': 'bufmgt', # mm/highmem.c, include/linux/mm.h, include/linux/mm.h, include/linux/mm.h, - 'page_cache_readahead': 'bufmgt', # mm/readahead.c, include/linux/mm.h, + 'page_add_anon_rmap' : 'buffer', # mm/rmap.c, include/linux/rmap.h, + 'page_add_file_rmap': 'buffer', # mm/rmap.c, include/linux/rmap.h, + 'page_address': 'buffer', # mm/highmem.c, include/linux/mm.h, include/linux/mm.h, include/linux/mm.h, + 'page_cache_readahead': 'buffer', # mm/readahead.c, include/linux/mm.h, 'page_fault': 'interrupt', # - 'page_remove_rmap': 'bufmgt', # mm/rmap.c, include/linux/rmap.h, - 'page_slot': 'bufmgt', # mm/highmem.c, + 'page_remove_rmap': 'buffer', # mm/rmap.c, include/linux/rmap.h, + 'page_slot': 'buffer', # mm/highmem.c, 'page_symlink' : 'other', # fs/namei.c, include/linux/fs.h, - 'page_waitqueue' : 'bufmgt', # mm/filemap.c, - 'pagevec_lookup': 'bufmgt', # mm/swap.c, include/linux/pagevec.h, - 'pagevec_lookup_tag' : 'bufmgt', # mm/swap.c, include/linux/pagevec.h, + 'page_waitqueue' : 'buffer', # mm/filemap.c, + 'pagevec_lookup': 'buffer', # mm/swap.c, include/linux/pagevec.h, + 'pagevec_lookup_tag' : 'buffer', # mm/swap.c, include/linux/pagevec.h, 'pal_dtb_ldq' : 'interrupt', # 'pal_itb_ldq' : 'interrupt', # 'pal_post_interrupt' : 'interrupt', # @@ -1084,14 +1172,14 @@ categories = { 'pci_read': 'driver', # 'pci_unmap_page' : 'driver', # arch/alpha/kernel/pci_iommu.c, include/asm-generic/pci-dma-compat.h, include/asm-alpha/pci.h, 'pci_unmap_single' : 'driver', # arch/alpha/kernel/pci_iommu.c, arch/alpha/kernel/pci-noop.c, include/asm-generic/pci-dma-compat.h, drivers/scsi/aic7xxx/aic79xx_osm.h, drivers/scsi/aic7xxx/aic7xxx_osm.h, include/asm-alpha/pci.h, - 'percpu_counter_mod' : 'bufmgt', # mm/swap.c, include/linux/percpu_counter.h, + 'percpu_counter_mod' : 'buffer', # mm/swap.c, include/linux/percpu_counter.h, 'perl': 'other', # 'permission' : 'user', # fs/namei.c, include/linux/fs.h, used to be syscall 'pfifo_fast_dequeue' : 'stack', # net/sched/sch_generic.c, 'pfifo_fast_enqueue' : 'stack', # net/sched/sch_generic.c, - 'pgd_alloc': 'bufmgt', # arch/alpha/mm/init.c, include/asm-alpha/pgalloc.h, include/asm-i386/pgalloc.h, - 'pgd_ctor': 'bufmgt', # include/asm-i386/pgtable.h, - 'pgd_free': 'bufmgt', # include/asm-alpha/pgalloc.h, include/asm-i386/pgalloc.h, + 'pgd_alloc': 'buffer', # arch/alpha/mm/init.c, include/asm-alpha/pgalloc.h, include/asm-i386/pgalloc.h, + 'pgd_ctor': 'buffer', # include/asm-i386/pgtable.h, + 'pgd_free': 'buffer', # include/asm-alpha/pgalloc.h, include/asm-i386/pgalloc.h, 'pipe_ioctl': 'other', # fs/pipe.c, 'pipe_new': 'other', # fs/pipe.c, include/linux/pipe_fs_i.h, 'pipe_poll': 'other', # fs/pipe.c, @@ -1111,14 +1199,14 @@ categories = { 'poll_initwait' : 'other', # fs/select.c, include/linux/poll.h, 'portmap': 'other', # 'preempt_schedule': 'other', # kernel/sched.c, include/linux/preempt.h, - 'prep_new_page' : 'bufmgt', # mm/page_alloc.c, + 'prep_new_page' : 'buffer', # mm/page_alloc.c, 'prepare_binprm': 'other', # fs/exec.c, include/linux/binfmts.h, 'prepare_to_copy': 'interrupt', # include/asm-alpha/processor.h, include/asm-i386/processor.h, 'prepare_to_wait' : 'other', # kernel/fork.c, - 'prio_tree_expand': 'bufmgt', # mm/prio_tree.c, - 'prio_tree_insert': 'bufmgt', # mm/prio_tree.c, - 'prio_tree_remove': 'bufmgt', # mm/prio_tree.c, - 'prio_tree_replace': 'bufmgt', # mm/prio_tree.c, + 'prio_tree_expand': 'buffer', # mm/prio_tree.c, + 'prio_tree_insert': 'buffer', # mm/prio_tree.c, + 'prio_tree_remove': 'buffer', # mm/prio_tree.c, + 'prio_tree_replace': 'buffer', # mm/prio_tree.c, 'proc_alloc_inode': 'other', # fs/proc/inode.c, 'proc_calc_metrics': 'other', # fs/proc/proc_misc.c, 'proc_delete_inode': 'other', # fs/proc/inode.c, @@ -1137,8 +1225,8 @@ categories = { 'profile_task_exit': 'other', # 'profile_tick': 'other', # 'pskb_expand_head': 'stack', # net/core/skbuff.c, include/linux/skbuff.h, - 'pte_alloc_map': 'bufmgt', # mm/memory.c, - 'pte_alloc_one': 'bufmgt', # include/asm-alpha/pgalloc.h, include/asm-i386/pgalloc.h, + 'pte_alloc_map': 'buffer', # mm/memory.c, + 'pte_alloc_one': 'buffer', # include/asm-alpha/pgalloc.h, include/asm-i386/pgalloc.h, 'ptrace_cancel_bpt' : 'user', # arch/alpha/kernel/ptrace.c, arch/alpha/kernel/proto.h, used to be syscall 'pty_chars_in_buffer': 'driver', # drivers/char/pty.c, 'pty_open': 'driver', # drivers/char/pty.c, @@ -1165,10 +1253,10 @@ categories = { 'radix_tree_tagged' : 'other', # lib/radix-tree.c, include/linux/radix-tree.h, 'raise_softirq' : 'interrupt', # kernel/softirq.c, 'raise_softirq_irqoff' : 'interrupt', # kernel/softirq.c, - 'rb_erase' : 'bufmgt', # lib/rbtree.c, include/linux/rbtree.h, - 'rb_insert_color' : 'bufmgt', # lib/rbtree.c, include/linux/rbtree.h, - 'rb_next' : 'bufmgt', # lib/rbtree.c, fs/jffs2/nodelist.h, include/linux/rbtree.h, - 'rb_prev' : 'bufmgt', # lib/rbtree.c, fs/jffs2/nodelist.h, include/linux/rbtree.h, + 'rb_erase' : 'buffer', # lib/rbtree.c, include/linux/rbtree.h, + 'rb_insert_color' : 'buffer', # lib/rbtree.c, include/linux/rbtree.h, + 'rb_next' : 'buffer', # lib/rbtree.c, fs/jffs2/nodelist.h, include/linux/rbtree.h, + 'rb_prev' : 'buffer', # lib/rbtree.c, fs/jffs2/nodelist.h, include/linux/rbtree.h, 'rcu_check_callbacks' : 'other', # kernel/rcupdate.c, include/linux/rcupdate.h, 'rcu_check_quiescent_state' : 'other', # kernel/rcupdate.c, 'rcu_do_batch' : 'other', # kernel/rcupdate.c, @@ -1182,15 +1270,15 @@ categories = { 'recalc_sigpending_tsk' : 'interrupt', # kernel/signal.c, 'recalc_task_prio' : 'other', # kernel/sched.c, 'release_blocks' : 'other', # fs/ext2/balloc.c, - 'release_pages' : 'bufmgt', # mm/swap.c, include/linux/pagemap.h, + 'release_pages' : 'buffer', # mm/swap.c, include/linux/pagemap.h, 'release_sock' : 'stack', # net/core/sock.c, 'release_task': 'other', # kernel/exit.c, include/linux/sched.h, 'release_thread': 'interrupt', # arch/alpha/kernel/process.c, include/asm-um/processor-generic.h, include/asm-alpha/processor.h, include/asm-i386/processor.h, 'release_x86_irqs': 'interrupt', # include/asm-i386/irq.h, 'remove_arg_zero': 'other', # fs/exec.c, include/linux/binfmts.h, - 'remove_from_page_cache': 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, - 'remove_suid' : 'bufmgt', # mm/filemap.c, include/linux/fs.h, - 'remove_vm_struct': 'bufmgt', # mm/mmap.c, + 'remove_from_page_cache': 'buffer', # mm/filemap.c, include/linux/pagemap.h, + 'remove_suid' : 'buffer', # mm/filemap.c, include/linux/fs.h, + 'remove_vm_struct': 'buffer', # mm/mmap.c, 'remove_wait_queue' : 'other', # kernel/fork.c, 'resched_task' : 'other', # kernel/sched.c, 'reserve_blocks' : 'other', # fs/ext2/balloc.c, @@ -1207,7 +1295,7 @@ categories = { 'ret_from_sys_call' : 'user', # arch/alpha/kernel/signal.c, used to be syscall 'rm': 'other', # 'rm_from_queue': 'other', # kernel/signal.c, - 'rmqueue_bulk' : 'bufmgt', # mm/page_alloc.c, + 'rmqueue_bulk' : 'buffer', # mm/page_alloc.c, 'rt_check_expire': 'stack', # net/ipv4/route.c, 'rt_hash_code' : 'stack', # net/ipv4/route.c, 'rt_intern_hash': 'stack', # net/ipv4/route.c, net/ipv4/route.c, @@ -1268,48 +1356,48 @@ categories = { 'set_binfmt': 'other', # fs/exec.c, include/linux/binfmts.h, 'set_brk': 'user', # fs/binfmt_aout.c, fs/binfmt_elf.c, 'set_current_groups' : 'other', # kernel/sys.c, include/linux/sched.h, - 'set_page_address': 'bufmgt', # mm/highmem.c, include/linux/mm.h, include/linux/mm.h, include/linux/mm.h, - 'set_page_dirty': 'bufmgt', # mm/page-writeback.c, - 'set_slab_attr' : 'bufmgt', # mm/slab.c, + 'set_page_address': 'buffer', # mm/highmem.c, include/linux/mm.h, include/linux/mm.h, include/linux/mm.h, + 'set_page_dirty': 'buffer', # mm/page-writeback.c, + 'set_slab_attr' : 'buffer', # mm/slab.c, 'set_task_comm': 'other', # 'setfl' : 'user', # fs/fcntl.c, used to be syscall 'setup_arg_pages': 'other', # fs/exec.c, include/linux/binfmts.h, 'setup_frame' : 'interrupt', # arch/alpha/kernel/signal.c, 'setup_sigcontext' : 'interrupt', # arch/alpha/kernel/signal.c, 'show_stat': 'other', # fs/proc/proc_misc.c, - 'si_swapinfo': 'bufmgt', # mm/swapfile.c, include/linux/swap.h, include/linux/swap.h, + 'si_swapinfo': 'buffer', # mm/swapfile.c, include/linux/swap.h, include/linux/swap.h, 'sig_ignored' : 'other', # kernel/signal.c, 'signal_wake_up' : 'other', # kernel/signal.c, include/linux/sched.h, 'sigprocmask' : 'other', # kernel/signal.c, include/linux/signal.h, 'single_open': 'other', # fs/seq_file.c, include/linux/seq_file.h, - 'sk_alloc' : 'bufmgt', # net/core/sock.c, - 'sk_free' : 'bufmgt', # net/core/sock.c, - 'sk_reset_timer' : 'bufmgt', # net/core/sock.c, - 'sk_stop_timer' : 'bufmgt', # net/core/sock.c, - 'sk_stream_kill_queues' : 'bufmgt', # net/core/stream.c, - 'sk_stream_mem_schedule' : 'bufmgt', # net/core/stream.c, - 'sk_stream_rfree' : 'bufmgt', # net/core/stream.c, - 'sk_stream_wait_close' : 'bufmgt', # net/core/stream.c, - 'sk_stream_wait_memory' : 'bufmgt', # net/core/stream.c, - 'sk_stream_write_space' : 'bufmgt', # net/core/stream.c, - 'sk_wait_data' : 'bufmgt', # net/core/sock.c, + 'sk_alloc' : 'buffer', # net/core/sock.c, + 'sk_free' : 'buffer', # net/core/sock.c, + 'sk_reset_timer' : 'buffer', # net/core/sock.c, + 'sk_stop_timer' : 'buffer', # net/core/sock.c, + 'sk_stream_kill_queues' : 'buffer', # net/core/stream.c, + 'sk_stream_mem_schedule' : 'buffer', # net/core/stream.c, + 'sk_stream_rfree' : 'buffer', # net/core/stream.c, + 'sk_stream_wait_close' : 'buffer', # net/core/stream.c, + 'sk_stream_wait_memory' : 'buffer', # net/core/stream.c, + 'sk_stream_write_space' : 'buffer', # net/core/stream.c, + 'sk_wait_data' : 'buffer', # net/core/sock.c, 'skb_checksum': 'stack', # net/core/skbuff.c, include/linux/skbuff.h, 'skb_checksum_help': 'stack', # net/core/dev.c, include/linux/netdevice.h, - 'skb_clone' : 'bufmgt', # net/core/skbuff.c, include/linux/skbuff.h, + 'skb_clone' : 'buffer', # net/core/skbuff.c, include/linux/skbuff.h, 'skb_copy_and_csum_bits' : 'copy', # net/core/skbuff.c, include/linux/skbuff.h, 'skb_copy_and_csum_datagram':'copy', 'skb_copy_bits' : 'copy', # net/core/skbuff.c, include/linux/skbuff.h, 'skb_copy_datagram_iovec' : 'copy', # net/core/datagram.c, include/linux/skbuff.h, - 'skb_dequeue' : 'bufmgt', # net/core/skbuff.c, include/linux/skbuff.h, - 'skb_drop_fraglist' : 'bufmgt', # net/core/skbuff.c, - 'skb_free_datagram' : 'bufmgt', # net/core/datagram.c, include/linux/skbuff.h, + 'skb_dequeue' : 'buffer', # net/core/skbuff.c, include/linux/skbuff.h, + 'skb_drop_fraglist' : 'buffer', # net/core/skbuff.c, + 'skb_free_datagram' : 'buffer', # net/core/datagram.c, include/linux/skbuff.h, 'skb_queue_head': 'stack', # net/core/skbuff.c, include/linux/skbuff.h, - 'skb_queue_tail' : 'bufmgt', # net/core/skbuff.c, include/linux/skbuff.h, - 'skb_read_and_csum_bits' : 'bufmgt', # net/sunrpc/xprt.c, - 'skb_recv_datagram' : 'bufmgt', # net/core/datagram.c, include/linux/skbuff.h, - 'skb_release_data' : 'bufmgt', # net/core/skbuff.c, net/core/dev.c, + 'skb_queue_tail' : 'buffer', # net/core/skbuff.c, include/linux/skbuff.h, + 'skb_read_and_csum_bits' : 'buffer', # net/sunrpc/xprt.c, + 'skb_recv_datagram' : 'buffer', # net/core/datagram.c, include/linux/skbuff.h, + 'skb_release_data' : 'buffer', # net/core/skbuff.c, net/core/dev.c, 'skip_atoi': 'other', # lib/vsprintf.c, - 'slab_destroy' : 'bufmgt', # mm/slab.c, + 'slab_destroy' : 'buffer', # mm/slab.c, 'smp_apic_timer_interrupt': 'interrupt', # 'smp_percpu_timer_interrupt' : 'interrupt', # arch/alpha/kernel/smp.c, arch/alpha/kernel/proto.h, 'snap_rcv': 'stack', # net/802/psnap.c, @@ -1342,7 +1430,7 @@ categories = { 'sockfd_lookup' : 'user', # net/socket.c, net/sched/sch_atm.c, include/linux/net.h, used to be syscall 'sockfs_delete_dentry' : 'user', # net/socket.c, used to be syscall 'sort': 'driver', # drivers/scsi/eata.c, drivers/scsi/u14-34f.c, - 'split_vma': 'bufmgt', # mm/mmap.c, include/linux/mm.h, + 'split_vma': 'buffer', # mm/mmap.c, include/linux/mm.h, 'sprintf' : 'other', # lib/vsprintf.c, drivers/isdn/hardware/eicon/platform.h, 'sshd': 'other', # 'steal_locks': 'other', # fs/locks.c, include/linux/fs.h, @@ -1352,7 +1440,7 @@ categories = { 'strncpy' : 'copy', # lib/string.c, include/asm-alpha/string.h, 'strncpy_from_user': 'copy', # include/asm-alpha/uaccess.h, include/asm-i386/uaccess.h, 'strnlen_user': 'other', # include/asm-alpha/uaccess.h, include/asm-i386/uaccess.h, - 'submit_bh' : 'bufmgt', # fs/buffer.c, include/linux/buffer_head.h, + 'submit_bh' : 'buffer', # fs/buffer.c, include/linux/buffer_head.h, 'submit_bio' : 'other', # drivers/block/ll_rw_blk.c, include/linux/fs.h, 'sunrpc': 'other', # 'svc_authenticate' : 'other', # net/sunrpc/svcauth.c, include/linux/sunrpc/svcauth.h, @@ -1539,13 +1627,13 @@ categories = { 'tcp_v4_synq_add' : 'stack', # net/ipv4/tcp_ipv4.c, 'tcp_vegas_init' : 'stack', # net/ipv4/tcp_input.c, 'tcp_write_xmit' : 'stack', # net/ipv4/tcp_output.c, - 'test_clear_page_dirty': 'bufmgt', # mm/page-writeback.c, include/linux/page-flags.h, - 'test_clear_page_writeback' : 'bufmgt', # mm/page-writeback.c, include/linux/page-flags.h, - 'test_set_page_writeback' : 'bufmgt', # mm/page-writeback.c, include/linux/page-flags.h, + 'test_clear_page_dirty': 'buffer', # mm/page-writeback.c, include/linux/page-flags.h, + 'test_clear_page_writeback' : 'buffer', # mm/page-writeback.c, include/linux/page-flags.h, + 'test_set_page_writeback' : 'buffer', # mm/page-writeback.c, include/linux/page-flags.h, 'timer_interrupt' : 'interrupt', # arch/alpha/kernel/time.c, arch/alpha/kernel/proto.h, 'tr': 'other', # - 'truncate_complete_page': 'bufmgt', # mm/truncate.c, - 'truncate_inode_pages': 'bufmgt', # mm/truncate.c, include/linux/mm.h, + 'truncate_complete_page': 'buffer', # mm/truncate.c, + 'truncate_inode_pages': 'buffer', # mm/truncate.c, include/linux/mm.h, 'try_to_wake_up' : 'other', # kernel/sched.c, 'tsunami_readb': 'driver', 'tsunami_readl' : 'interrupt', # include/asm-alpha/core_tsunami.h, @@ -1577,14 +1665,14 @@ categories = { 'unix': 'other', # 'unlock_buffer' : 'other', # fs/buffer.c, 'unlock_new_inode': 'other', # fs/inode.c, include/linux/fs.h, - 'unlock_page' : 'bufmgt', # mm/filemap.c, - 'unmap_mapping_range': 'bufmgt', # mm/memory.c, include/linux/mm.h, - 'unmap_page_range': 'bufmgt', # mm/memory.c, - 'unmap_region': 'bufmgt', # mm/mmap.c, + 'unlock_page' : 'buffer', # mm/filemap.c, + 'unmap_mapping_range': 'buffer', # mm/memory.c, include/linux/mm.h, + 'unmap_page_range': 'buffer', # mm/memory.c, + 'unmap_region': 'buffer', # mm/mmap.c, 'unmap_underlying_metadata' : 'other', # fs/buffer.c, include/linux/buffer_head.h, - 'unmap_vma': 'bufmgt', # mm/mmap.c, - 'unmap_vma_list': 'bufmgt', # mm/mmap.c, - 'unmap_vmas': 'bufmgt', # mm/memory.c, include/linux/mm.h, + 'unmap_vma': 'buffer', # mm/mmap.c, + 'unmap_vma_list': 'buffer', # mm/mmap.c, + 'unmap_vmas': 'buffer', # mm/memory.c, include/linux/mm.h, 'unmask_IO_APIC_irq': 'interrupt', # 'unmask_IO_APIC_vector': 'interrupt', # 'unqueue_me': 'other', # kernel/futex.c, @@ -1610,28 +1698,28 @@ categories = { 'vfs_unlink': 'other', # fs/namei.c, include/linux/fs.h, 'vfs_write' : 'user', # fs/read_write.c, include/linux/fs.h, used to be syscall 'vfs_writev' : 'user', # fs/read_write.c, include/linux/fs.h, used to be syscall - 'vma_adjust': 'bufmgt', # mm/mmap.c, include/linux/mm.h, - 'vma_link': 'bufmgt', # mm/mmap.c, - 'vma_merge': 'bufmgt', # mm/mmap.c, include/linux/mm.h, - 'vma_prio_tree_add': 'bufmgt', # mm/prio_tree.c, include/linux/mm.h, - 'vma_prio_tree_insert': 'bufmgt', # mm/prio_tree.c, include/linux/mm.h, - 'vma_prio_tree_remove': 'bufmgt', # mm/prio_tree.c, include/linux/mm.h, + 'vma_adjust': 'buffer', # mm/mmap.c, include/linux/mm.h, + 'vma_link': 'buffer', # mm/mmap.c, + 'vma_merge': 'buffer', # mm/mmap.c, include/linux/mm.h, + 'vma_prio_tree_add': 'buffer', # mm/prio_tree.c, include/linux/mm.h, + 'vma_prio_tree_insert': 'buffer', # mm/prio_tree.c, include/linux/mm.h, + 'vma_prio_tree_remove': 'buffer', # mm/prio_tree.c, include/linux/mm.h, 'vmstat_open': 'other', # fs/proc/proc_misc.c, - 'vmstat_show': 'bufmgt', # mm/page_alloc.c, - 'vmtruncate': 'bufmgt', # mm/nommu.c, mm/memory.c, include/linux/mm.h, + 'vmstat_show': 'buffer', # mm/page_alloc.c, + 'vmtruncate': 'buffer', # mm/nommu.c, mm/memory.c, include/linux/mm.h, 'vsnprintf' : 'other', # lib/vsprintf.c, include/linux/kernel.h, 'vsprintf' : 'driver', # lib/vsprintf.c, arch/alpha/boot/main.c, drivers/scsi/aic7xxx_old/aic7xxx_proc.c, include/linux/kernel.h, 'wait_for_completion': 'driver', # drivers/acorn/block/mfmhd.c, kernel/sched.c, - 'wait_on_page_writeback_range' : 'bufmgt', # mm/filemap.c, + 'wait_on_page_writeback_range' : 'buffer', # mm/filemap.c, 'wait_task_zombie': 'other', # kernel/exit.c, 'wake_futex': 'other', # kernel/futex.c, 'wake_up_buffer' : 'other', # fs/buffer.c, include/linux/buffer_head.h, 'wake_up_inode' : 'other', # fs/inode.c, include/linux/writeback.h, 'wake_up_new_task': 'other', # - 'wake_up_page' : 'bufmgt', # mm/filemap.c, + 'wake_up_page' : 'buffer', # mm/filemap.c, 'wake_up_process' : 'other', # kernel/sched.c, 'wake_up_state' : 'other', # kernel/sched.c, - 'wb_timer_fn': 'bufmgt', # mm/page-writeback.c, mm/page-writeback.c, + 'wb_timer_fn': 'buffer', # mm/page-writeback.c, mm/page-writeback.c, 'wc': 'other', # 'work_notifysig': 'other', # 'work_pending' : 'other', # @@ -1647,9 +1735,9 @@ categories = { 'xdr_partial_copy_from_skb' : 'copy', # net/sunrpc/xdr.c, include/linux/sunrpc/xdr.h, 'xfrm_lookup' : 'stack', # net/xfrm/xfrm_policy.c, 'xmms': 'other', # - 'zap_pmd_range': 'bufmgt', # mm/memory.c, - 'zap_pte_range': 'bufmgt', # mm/memory.c, - 'zone_statistics' : 'bufmgt', # mm/page_alloc.c, + 'zap_pmd_range': 'buffer', # mm/memory.c, + 'zap_pte_range': 'buffer', # mm/memory.c, + 'zone_statistics' : 'buffer', # mm/page_alloc.c, 'libaprutil-0.so.0' : 'user', 'libapr-0.so.0' : 'user', 'httpd' : 'user', @@ -1660,7 +1748,7 @@ categories = { 'ip_route_output_slow': 'stack', 'tcp_sendpage': 'copy', 'file_send_actor': 'copy', - 'flush_tlb_page': 'bufmgt', + 'flush_tlb_page': 'buffer', 'sock_common_setsockopt': 'stack', 'sock_sendpage': 'copy', @@ -1668,7 +1756,7 @@ categories = { # New functions # - '__alloc_percpu': 'bufmgt', # mm/slab.c, include/linux/percpu.h, + '__alloc_percpu': 'buffer', # mm/slab.c, include/linux/percpu.h, '__pskb_pull_tail': 'stack', # net/core/skbuff.c, include/linux/skbuff.h, '__reml': 'other', # arch/alpha/kernel/alpha_ksyms.c, '__tasklet_hi_schedule': 'interrupt', # kernel/softirq.c, @@ -1681,13 +1769,13 @@ categories = { 'alcor_disable_irq': 'interrupt', # arch/alpha/kernel/sys_alcor.c, 'alpha_read_fp_reg': 'other', # arch/alpha/lib/fpreg.c, arch/alpha/kernel/proto.h, arch/alpha/math-emu/math.c, include/asm-alpha/fpu.h, 'atkbd_probe': 'other', # drivers/input/keyboard/atkbd.c, - 'background_writeout': 'bufmgt', # mm/page-writeback.c, mm/page-writeback.c, - 'bad_page': 'bufmgt', # mm/page_alloc.c, + 'background_writeout': 'buffer', # mm/page-writeback.c, mm/page-writeback.c, + 'bad_page': 'buffer', # mm/page_alloc.c, 'batch_entropy_process': 'other', # drivers/char/random.c, drivers/char/random.c, 'block_hotplug_filter': 'driver', # drivers/block/genhd.c, 'brioctl_set': 'stack', # net/socket.c, include/linux/if_bridge.h, 'cdev_put': 'fs', # fs/char_dev.c, include/linux/cdev.h, - 'change_protection': 'bufmgt', # mm/mprotect.c, + 'change_protection': 'buffer', # mm/mprotect.c, 'check_timer_failed': 'interrupt', # kernel/timer.c, 'clipper_disable_irq': 'interrupt', # arch/alpha/kernel/sys_dp264.c, 'clipper_enable_irq': 'interrupt', # arch/alpha/kernel/sys_dp264.c, @@ -1700,8 +1788,8 @@ categories = { 'do_entDbg': 'interrupt', # arch/alpha/kernel/traps.c, 'do_proc_dointvec_jiffies_conv': 'interrupt', # kernel/sysctl.c, 'down_interruptible': 'interrupt', # arch/alpha/kernel/semaphore.c, include/asm-alpha/semaphore.h, include/asm-i386/semaphore.h, include/asm-alpha/semaphore.h, net/ipv4/netfilter/ip_tables.c, net/ipv6/netfilter/ip6_tables.c, - 'drain_array': 'bufmgt', # - 'drain_cpu_caches': 'bufmgt', # mm/slab.c, + 'drain_array': 'buffer', # + 'drain_cpu_caches': 'buffer', # mm/slab.c, 'dummy_file_fcntl': 'other', # security/dummy.c, 'dummy_sem_semop': 'other', # security/dummy.c, 'emit_log_char': 'other', # kernel/printk.c, @@ -1711,19 +1799,19 @@ categories = { 'eth_header_parse': 'stack', # net/ethernet/eth.c, include/linux/etherdevice.h, 'ethtool_get_settings': 'stack', # net/core/ethtool.c, 'fifo_open': 'fs', # fs/fifo.c, - 'find_trylock_page': 'bufmgt', # mm/filemap.c, include/linux/pagemap.h, - 'find_undo': 'bufmgt', # ipc/sem.c, - 'find_user': 'bufmgt', # kernel/user.c, include/linux/sched.h, + 'find_trylock_page': 'buffer', # mm/filemap.c, include/linux/pagemap.h, + 'find_undo': 'buffer', # ipc/sem.c, + 'find_user': 'buffer', # kernel/user.c, include/linux/sched.h, 'flow_cache_cpu_prepare': 'stack', # net/core/flow.c, 'flow_cache_flush_per_cpu': 'stack', # net/core/flow.c, 'flow_cache_flush_tasklet': 'stack', # net/core/flow.c, 'flow_key_compare': 'stack', # net/core/flow.c, 'flush_icache_user_range': 'interrupt', # arch/alpha/kernel/smp.c, include/asm-alpha/cacheflush.h, include/asm-alpha/cacheflush.h, include/asm-i386/cacheflush.h, 'flush_tlb_mm': 'interrupt', # arch/alpha/kernel/smp.c, include/asm-alpha/tlbflush.h, include/asm-i386/tlbflush.h, include/asm-alpha/tlbflush.h, include/asm-i386/tlbflush.h, - 'force_page_cache_readahead': 'bufmgt', # mm/readahead.c, include/linux/mm.h, - 'free_percpu': 'bufmgt', # mm/slab.c, include/linux/percpu.h, include/linux/percpu.h, - 'generic_file_sendfile': 'bufmgt', # mm/filemap.c, include/linux/fs.h, - 'get_one_pte_map': 'bufmgt', # mm/mremap.c, + 'force_page_cache_readahead': 'buffer', # mm/readahead.c, include/linux/mm.h, + 'free_percpu': 'buffer', # mm/slab.c, include/linux/percpu.h, include/linux/percpu.h, + 'generic_file_sendfile': 'buffer', # mm/filemap.c, include/linux/fs.h, + 'get_one_pte_map': 'buffer', # mm/mremap.c, 'gunzip': 'other', # lib/inflate.c, 'handle_ipi': 'interrupt', # arch/alpha/kernel/smp.c, arch/alpha/kernel/proto.h, 'input_devices_read': 'driver', # drivers/input/input.c, @@ -1748,8 +1836,8 @@ categories = { 'isp1020_intr_handler': 'other', # drivers/scsi/qlogicisp.c, drivers/scsi/qlogicisp.c, 'isp1020_queuecommand': 'other', # drivers/scsi/qlogicisp.c, drivers/scsi/qlogicisp.h, 'kernel_thread': 'interrupt', # include/asm-um/processor-generic.h, include/asm-alpha/processor.h, include/asm-i386/processor.h, - 'kmem_find_general_cachep': 'bufmgt', # mm/slab.c, - 'kmem_ptr_validate': 'bufmgt', # mm/slab.c, + 'kmem_find_general_cachep': 'buffer', # mm/slab.c, + 'kmem_ptr_validate': 'buffer', # mm/slab.c, 'llc_mac_hdr_init': 'stack', # net/llc/llc_output.c, net/llc/llc_output.h, 'lock_rename': 'fs', # fs/namei.c, include/linux/namei.h, 'lookup_undo': 'stack', # ipc/sem.c, @@ -1759,7 +1847,7 @@ categories = { 'netlink_release': 'stack', # net/netlink/netlink_dev.c, net/netlink/af_netlink.c, 'nf_log_packet': 'stack', # net/core/netfilter.c, include/linux/netfilter_logging.h, include/linux/netfilter.h, 'nf_queue': 'stack', # net/core/netfilter.c, - 'nr_free_zone_pages': 'bufmgt', # mm/page_alloc.c, + 'nr_free_zone_pages': 'buffer', # mm/page_alloc.c, 'osf_writev': 'driver', # arch/alpha/kernel/osf_sys.c, 'pci_map_sg': 'driver', # arch/alpha/kernel/pci-noop.c, arch/alpha/kernel/pci_iommu.c, include/asm-generic/pci-dma-compat.h, include/asm-alpha/pci.h, 'pci_unmap_sg': 'driver', # arch/alpha/kernel/pci-noop.c, arch/alpha/kernel/pci_iommu.c, include/asm-generic/pci-dma-compat.h, include/asm-alpha/pci.h, @@ -1770,7 +1858,7 @@ categories = { 'prepare_timeout': 'interrupt', # ipc/mqueue.c, 'printk': 'other', # kernel/printk.c, drivers/md/raid6.h, 'process_mcheck_info': 'interrupt', # arch/alpha/kernel/irq_alpha.c, arch/alpha/kernel/proto.h, - 'read_cache_pages': 'bufmgt', # mm/readahead.c, include/linux/pagemap.h, + 'read_cache_pages': 'buffer', # mm/readahead.c, include/linux/pagemap.h, 'register_gifconf': 'stack', # net/core/dev.c, include/linux/netdevice.h, 'rwsem_down_read_failed': 'interrupt', # lib/rwsem.c, include/asm-alpha/rwsem.h, 'search_exception_tables': 'interrupt', # kernel/extable.c, include/linux/module.h, @@ -1790,10 +1878,10 @@ categories = { 'sock_wait_for_wmem': 'stack', # net/core/sock.c, 'srm_dispatch': 'other', # 'srm_fixup': 'other', # include/asm-alpha/console.h, - 'stxcpy_aligned': 'bufmgt', # + 'stxcpy_aligned': 'buffer', # 'sys_capset': 'other', # kernel/capability.c, include/linux/syscalls.h, - 'sys_fadvise64': 'bufmgt', # mm/fadvise.c, include/linux/syscalls.h, - 'sys_fadvise64_64': 'bufmgt', # mm/fadvise.c, include/linux/syscalls.h, + 'sys_fadvise64': 'buffer', # mm/fadvise.c, include/linux/syscalls.h, + 'sys_fadvise64_64': 'buffer', # mm/fadvise.c, include/linux/syscalls.h, 'sys_newfstat': 'fs', # fs/stat.c, include/linux/syscalls.h, 'sys_semop': 'stack', # ipc/sem.c, include/linux/syscalls.h, 'sys_semtimedop': 'stack', # ipc/sem.c, include/linux/syscalls.h, @@ -1825,15 +1913,24 @@ categories = { 'unregister_netdevice': 'stack', # net/core/dev.c, include/linux/netdevice.h, 'update_queue': 'stack', # ipc/sem.c, 'vegas_cong_avoid': 'stack', # net/ipv4/tcp_input.c, - 'vm_acct_memory': 'bufmgt', # mm/swap.c, include/linux/mman.h, + 'vm_acct_memory': 'buffer', # mm/swap.c, include/linux/mman.h, 'vsscanf': 'other', # lib/vsprintf.c, include/linux/kernel.h, 'wait_for_packet': 'stack', # net/core/datagram.c, 'westwood_update_window': 'stack', # net/ipv4/tcp_input.c, 'within_one_quad': 'other', # } -categories_re = [ +pc_categories_re = [ # ( re.compile('.*'), 'other' ) ] +def pc_categorize(symbol): + from categories import pc_categories, pc_categories_re + if symbol in pc_categories: + return pc_categories[symbol] + for regexp, category in pc_categories_re: + if regexp.match(symbol): + return category + + return None diff --git a/util/stats/output.py b/util/stats/output.py index 44dba5d15..f793749f7 100644 --- a/util/stats/output.py +++ b/util/stats/output.py @@ -96,10 +96,10 @@ class StatOutput(object): self.printdata(printmode=printmode) def graph(self, graphdir): - from os.path import expanduser, join as joinpath + from os.path import expanduser, isdir, join as joinpath from barchart import BarChart - from matplotlib.numerix import Float, zeros - import re + from matplotlib.numerix import Float, array, zeros + import os, re confgroups = self.jobfile.groups() ngroups = len(confgroups) @@ -130,6 +130,8 @@ class StatOutput(object): raise AttributeError, 'No group selected for graph bars' directory = expanduser(graphdir) + if not isdir(directory): + os.mkdir(directory) html = file(joinpath(directory, '%s.html' % self.name), 'w') print >>html, '<html>' print >>html, '<title>Graphs for %s</title>' % self.name @@ -143,6 +145,8 @@ class StatOutput(object): for g,gopt in enumerate(groupopts): for b,bopt in enumerate(baropts): job = self.jobfile.job(options + [ gopt, bopt ]) + if not job: + continue val = self.info.get(job, self.stat) if val is None: @@ -156,6 +160,10 @@ class StatOutput(object): data[g][b] = val + data = array(data) + if data.sum() == 0: + continue + bar_descs = [ opt.desc for opt in baropts ] group_descs = [ opt.desc for opt in groupopts ] if stacked: diff --git a/util/stats/profile.py b/util/stats/profile.py index 65a03e9aa..cf946452b 100644 --- a/util/stats/profile.py +++ b/util/stats/profile.py @@ -27,103 +27,227 @@ from orderdict import orderdict import output -class ProfileData(object): - def __init__(self): - self.data = {} - self.total = {} - self.runs = orderdict() - self.runlist = [] +class RunData(dict): + def __init__(self, filename=None): + self.filename = filename - def addvalue(self, run, cpu, symbol, value): - value = float(value) - self.data[run, cpu, symbol] = self.getvalue(run, cpu, symbol) + value - self.total[run, cpu] = self.gettotal(run, cpu) + value - if run not in self.runs: - self.runs[run] = orderdict() + def __getattr__(self, attr): + if attr == 'total': + total = 0.0 + for value in self.itervalues(): + total += value + return total + if attr == 'maxsymlen': + return max([ len(sym) for sym in self.iterkeys() ]) - if cpu not in self.runs[run]: - self.runs[run][cpu] = {} + def display(self, output=None, limit=None, maxsymlen=None): + if not output: + import sys + output = sys.stdout + elif isinstance(output, str): + output = file(output, 'w') - if symbol not in self.runs[run][cpu]: - self.runs[run][cpu][symbol] = 0 + total = float(self.total) - self.runs[run][cpu][symbol] += value + # swap (string,count) order so we can sort on count + symbols = [ (count,name) for name,count in self.iteritems() ] + symbols.sort(reverse=True) + if limit is not None: + symbols = symbols[:limit] - def getvalue(self, run, cpu, symbol): - return self.data.get((run, cpu, symbol), 0) + if not maxsymlen: + maxsymlen = self.maxsymlen - def gettotal(self, run, cpu): - return self.total.get((run, cpu), 0) + symbolf = "%-" + str(maxsymlen + 1) + "s %.2f%%" + for number,name in symbols: + print >>output, symbolf % (name, 100.0 * (float(number) / total)) -class Profile(object): - default_order = ['ste', 'hte', 'htd', 'ocm', 'occ', 'ocp'] - # This list controls the order of values in stacked bar data output - default_categories = [ 'interrupt', - 'driver', - 'stack', - 'bufmgt', - 'copy', - 'user', - 'other', - 'idle'] - def __init__(self, run_order=[], categories=[], stacknames=[]): - if not run_order: - run_order = Profile.default_order - if not categories: - categories = Profile.default_categories +class PCData(RunData): + def __init__(self, filename=None, categorize=None, showidle=True): + super(PCData, self).__init__(self, filename) + if filename is None: + return - self.run_order = run_order - self.categories = categories - self.rcategories = [] - self.rcategories.extend(categories) - self.rcategories.reverse() - self.stacknames = stacknames - self.prof = ProfileData() - self.categorize = True - self.showidle = True - self.maxsymlen = 0 - - def category(self, symbol): - from categories import categories, categories_re - if categories.has_key(symbol): - return categories[symbol] - for regexp, cat in categories_re: - if regexp.match(symbol): - return cat - return 'other' - - # Parse input file and put the results in the given run and cpu - def parsefile(self, run, cpu, filename): fd = file(filename) for line in fd: + if line.strip() == '>>>PC data': + break + + for line in fd: + if line.startswith('>>>'): + break + (symbol, count) = line.split() if symbol == "0x0": continue count = int(count) - if self.categorize: - symbol = self.category(symbol) - if symbol == 'idle' and not self.showidle: + if categorize is not None: + category = categorize(symbol) + if category is None: + category = 'other' + elif category == 'idle' and not showidle: continue - if symbol not in self.categories: - symbol = 'other' - - self.maxsymlen = max(self.maxsymlen, len(symbol)) - self.prof.addvalue(run, cpu, symbol, count) + self[category] = count fd.close() +class FuncNode(object): + def __new__(cls, filename = None): + if filename is None: + return super(FuncNode, cls).__new__(cls) + + fd = file(filename, 'r') + fditer = iter(fd) + nodes = {} + for line in fditer: + if line.strip() == '>>>function data': + break + + for line in fditer: + if line.startswith('>>>'): + break + + data = line.split() + node_id = int(data[0], 16) + node = FuncNode() + node.symbol = data[1] + node.count = int(data[2]) + node.children = [ int(child, 16) for child in data[3:] ] + nodes[node_id] = node + + for node in nodes.itervalues(): + children = [] + for cid in node.children: + child = nodes[cid] + children.append(child) + child.parent = node + node.children = tuple(children) + if not nodes: + print filename + print nodes + return nodes[0] + + def __init__(self, filename=None): + pass + + def total(self): + total = self.count + for child in self.children: + total += child.total() + + return total + + def aggregate(self, dict, categorize, incategory): + category = None + if categorize: + category = categorize(self.symbol) + + total = self.count + for child in self.children: + total += child.aggregate(dict, categorize, category or incategory) + + if category: + dict[category] = dict.get(category, 0) + total + return 0 + elif not incategory: + dict[self.symbol] = dict.get(self.symbol, 0) + total + + return total + + def dump(self): + kids = [ child.symbol for child in self.children] + print '%s %d <%s>' % (self.symbol, self.count, ', '.join(kids)) + for child in self.children: + child.dump() + + def _dot(self, dot, threshold, categorize, total): + from pydot import Dot, Edge, Node + self.dot_node = None + + value = self.total() * 100.0 / total + if value < threshold: + return + if categorize: + category = categorize(self.symbol) + if category and category != 'other': + return + label = '%s %.2f%%' % (self.symbol, value) + self.dot_node = Node(self, label=label) + dot.add_node(self.dot_node) + + for child in self.children: + child._dot(dot, threshold, categorize, total) + if child.dot_node is not None: + dot.add_edge(Edge(self, child)) + + def _cleandot(self): + for child in self.children: + child._cleandot() + self.dot_node = None + del self.__dict__['dot_node'] + + def dot(self, dot, threshold=0.1, categorize=None): + self._dot(dot, threshold, categorize, self.total()) + self._cleandot() + +class FuncData(RunData): + def __init__(self, filename, categorize=None): + super(FuncData, self).__init__(filename) + self.tree = FuncNode(filename) + self.tree.aggregate(self, categorize, incategory=False) + self.total = self.tree.total() + + def displayx(self, output=None, maxcount=None): + if output is None: + import sys + output = sys.stdout + + items = [ (val,key) for key,val in self.iteritems() ] + items.sort(reverse=True) + for val,key in items: + if maxcount is not None: + if maxcount == 0: + return + maxcount -= 1 + + percent = val * 100.0 / self.total + print >>output, '%-30s %8s' % (key, '%3.2f%%' % percent) + +class Profile(object): + # This list controls the order of values in stacked bar data output + default_categories = [ 'interrupt', + 'driver', + 'stack', + 'buffer', + 'copy', + 'syscall', + 'user', + 'other', + 'idle'] + + def __init__(self, datatype, categorize=None): + categories = Profile.default_categories + + self.datatype = datatype + self.categorize = categorize + self.data = {} + self.categories = categories[:] + self.rcategories = categories[:] + self.rcategories.reverse() + self.cpu = 0 + # Read in files def inputdir(self, directory): import os, os.path, re from os.path import expanduser, join as joinpath directory = expanduser(directory) - label_ex = re.compile(r'm5prof\.(.*)') + label_ex = re.compile(r'profile\.(.*).dat') for root,dirs,files in os.walk(directory): for name in files: match = label_ex.match(name) @@ -133,14 +257,230 @@ class Profile(object): filename = joinpath(root, name) prefix = os.path.commonprefix([root, directory]) dirname = root[len(prefix)+1:] - self.parsefile(dirname, match.group(1), filename) + data = self.datatype(filename, self.categorize) + self.setdata(dirname, match.group(1), data) + + def setdata(self, run, cpu, data): + if run not in self.data: + self.data[run] = {} + + if cpu in self.data[run]: + raise AttributeError, \ + 'data already stored for run %s and cpu %s' % (run, cpu) + + self.data[run][cpu] = data + + def getdata(self, run, cpu): + try: + return self.data[run][cpu] + except KeyError: + return None + + def alldata(self): + for run,cpus in self.data.iteritems(): + for cpu,data in cpus.iteritems(): + yield run,cpu,data def get(self, job, stat): if job.system is None: raise AttributeError, 'The job must have a system set' - cpu = '%s.full0' % job.system + data = self.getdata(job.name, '%s.full%d' % (job.system, self.cpu)) + if not data: + return [ 0.0 for c in self.categories ] + values = [] - for cat in self.categories: - values.append(self.prof.getvalue(job.name, cpu, cat)) + for category in self.categories: + values.append(data.get(category, 0.0)) return values + + def dump(self): + for run,cpu,data in self.alldata(): + print 'run %s, cpu %s' % (run, cpu) + data.dump() + print + + def write_dot(self, threshold, jobfile=None, jobs=None): + import pydot + + if jobs is None: + jobs = [ job for job in jobfile.jobs() ] + + for job in jobs: + cpu = '%s.full%d' % (job.system, self.cpu) + symbols = self.getdata(job.name, cpu) + if not symbols: + continue + + dot = pydot.Dot() + symbols.tree.dot(dot, threshold=threshold) + dot.write(symbols.filename[:-3] + 'dot') + + def write_txt(self, jobfile=None, jobs=None): + if jobs is None: + jobs = [ job for job in jobfile.jobs() ] + + for job in jobs: + cpu = '%s.full%d' % (job.system, self.cpu) + symbols = self.getdata(job.name, cpu) + if not symbols: + continue + + output = file(symbols.filename[:-3] + 'txt', 'w') + symbols.display(output) + + def display(self, jobfile=None, jobs=None, limit=None): + if jobs is None: + jobs = [ job for job in jobfile.jobs() ] + + maxsymlen = 0 + + thejobs = [] + for job in jobs: + cpu = '%s.full%d' % (job.system, self.cpu) + symbols = self.getdata(job.name, cpu) + if symbols: + thejobs.append(job) + maxsymlen = max(maxsymlen, symbols.maxsymlen) + + for job in thejobs: + cpu = '%s.full%d' % (job.system, self.cpu) + symbols = self.getdata(job.name, cpu) + print job.name + symbols.display(limit=limit, maxsymlen=maxsymlen) + print + + +from categories import func_categorize, pc_categorize +class PCProfile(Profile): + def __init__(self, categorize=pc_categorize): + super(PCProfile, self).__init__(PCData, categorize) + + +class FuncProfile(Profile): + def __init__(self, categorize=func_categorize): + super(FuncProfile, self).__init__(FuncData, categorize) + +def usage(exitcode = None): + print '''\ +Usage: %s [-bc] [-g <dir>] [-j <jobfile>] [-n <num>] + + -c groups symbols into categories + -b dumps data for bar charts + -d generate dot output + -g <d> draw graphs and send output to <d> + -j <jobfile> specify a different jobfile (default is Test.py) + -n <n> selects number of top symbols to print (default 5) +''' % sys.argv[0] + + if exitcode is not None: + sys.exit(exitcode) + +if __name__ == '__main__': + import getopt, re, sys + from os.path import expanduser + from output import StatOutput + from jobfile import JobFile + + # default option values + numsyms = 10 + graph = None + cpus = [ 0 ] + categorize = False + showidle = True + funcdata = True + jobfilename = 'Test.py' + dodot = False + dotformat = 'raw' + textout = False + threshold = 0.01 + inputfile = None + + try: + opts, args = getopt.getopt(sys.argv[1:], 'C:cdD:f:g:ij:n:pT:t') + except getopt.GetoptError: + usage(2) + + for o,a in opts: + if o == '-C': + cpus = [ int(x) for x in a.split(',') ] + elif o == '-c': + categorize = True + elif o == '-D': + dotformat = a + elif o == '-d': + dodot = True + elif o == '-f': + inputfile = expanduser(a) + elif o == '-g': + graph = a + elif o == '-i': + showidle = False + elif o == '-j': + jobfilename = a + elif o == '-n': + numsyms = int(a) + elif o == '-p': + funcdata = False + elif o == '-T': + threshold = float(a) + elif o == '-t': + textout = True + + if args: + print "'%s'" % args, len(args) + usage(1) + + if inputfile: + data = FuncData(inputfile) + + if dodot: + import pydot + dot = pydot.Dot() + data.dot(dot, threshold=threshold) + #dot.orientation = 'landscape' + #dot.ranksep='equally' + #dot.rank='samerank' + dot.write(dotfile, format=dotformat) + else: + data.display(limit=numsyms) + + else: + jobfile = JobFile(jobfilename) + + if funcdata: + profile = FuncProfile() + else: + profile = PCProfile() + + profile.inputdir(jobfile.rootdir) + + if graph: + for cpu in cpus: + profile.cpu = cpu + if funcdata: + name = 'funcstacks%d' % cpu + else: + name = 'stacks%d' % cpu + output = StatOutput(name, jobfile, info=profile) + output.graph(graph) + + if dodot: + for cpu in cpus: + profile.cpu = cpu + profile.write_dot(jobfile=jobfile, threshold=threshold) + + if not categorize: + for cpu in cpus: + profile.cpu = cpu + profile.categorize = None + + if textout: + for cpu in cpus: + profile.cpu = cpu + profile.write_txt(jobfile=jobfile) + + if not graph and not textout and not dodot: + for cpu in cpus: + profile.cpu = cpu + profile.display(jobfile=jobfile, limit=numsyms) diff --git a/util/stats/stats.py b/util/stats/stats.py index c53d77d54..af9ae5575 100755 --- a/util/stats/stats.py +++ b/util/stats/stats.py @@ -465,10 +465,11 @@ if __name__ == '__main__': options.graph = False options.ticks = False options.printmode = 'G' + jobfilename = 'Test.py' options.jobfile = None options.all = False - opts, args = getopts(sys.argv[1:], '-BEFG:ad:g:h:j:pr:s:u:T:') + opts, args = getopts(sys.argv[1:], '-BEFG:Jad:g:h:j:pr:s:u:T:') for o,a in opts: if o == '-B': options.binned = True @@ -487,8 +488,10 @@ if __name__ == '__main__': options.graphdir = a if o == '-h': options.host = a + if o == '-J': + jobfilename = None if o == '-j': - options.jobfile = JobFile(a) + jobfilename = a if o == '-p': options.passwd = getpass.getpass() if o == '-r': @@ -500,7 +503,8 @@ if __name__ == '__main__': if o == '-T': options.ticks = a - if options.jobfile: + if jobfilename: + options.jobfile = JobFile(jobfilename) if not options.host: options.host = options.jobfile.dbhost if not options.db: |