restructure PCP metrics (merge from 2.2 branch)

(This used to be commit dc725c2256ff5f3d8ac37fe33cfa1685194f7f46)

1 files changed, 1 insertions, 292 deletions

diff --git a/pcp/help b/pcp/help
index d5a6d8f761..cc4ff33342 100644
--- a/pcp/help
+++ b/pcp/help
@@ -19,102 +19,6 @@
 
 @ samba.smbd.uid_changes Count of times effective uid changed
 
-@ samba.syscalls.opendir Number of calls to opendir system call
-
-@ samba.syscalls.opendir_time Time spent executing opendir system call
-
-@ samba.syscalls.readdir Number of calls to readdir system call
-
-@ samba.syscalls.readdir_time Time spent executing readdir system call
-
-@ samba.syscalls.mkdir Number of calls to mkdir system call
-
-@ samba.syscalls.mkdir_time Time spent executing mkdir system call
-
-@ samba.syscalls.rmdir Number of calls to rmdir system call
-
-@ samba.syscalls.rmdir_time Time spent executing rmdir system call
-
-@ samba.syscalls.closedir Number of calls to closedir system call
-
-@ samba.syscalls.closedir_time Time spent executing closedir system call
-
-@ samba.syscalls.open Number of calls to open system call
-
-@ samba.syscalls.open_time Time spent executing open system call
-
-@ samba.syscalls.close Number of calls to close system call
-
-@ samba.syscalls.close_time Time spent executing close system call
-
-@ samba.syscalls.read Number of calls to read system call
-
-@ samba.syscalls.read_time Time spent executing read system call
-
-@ samba.syscalls.read_bytes Number of bytes read by read system call
-
-@ samba.syscalls.write Number of calls to write system call
-
-@ samba.syscalls.write_time Time spent executing write system call
-
-@ samba.syscalls.write_bytes Number of bytes written by write system call
-
-@ samba.syscalls.lseek Number of calls to lseek system call
-
-@ samba.syscalls.lseek_time Time spent executing lseek system call
-
-@ samba.syscalls.rename Number of calls to rename system call
-
-@ samba.syscalls.rename_time Time spent executing rename system call
-
-@ samba.syscalls.fsync Number of calls to fsync system call
-
-@ samba.syscalls.fsync_time Time spent executing fsync system call
-
-@ samba.syscalls.stat Number of calls to stat system call
-
-@ samba.syscalls.stat_time Time spent executing stat system call
-
-@ samba.syscalls.fstat Number of calls to fstat system call
-
-@ samba.syscalls.fstat_time Time spent executing fstat system call
-
-@ samba.syscalls.lstat Number of calls to lstat system call
-
-@ samba.syscalls.lstat_time Time spent executing lstat system call
-
-@ samba.syscalls.unlink Number of calls to unlink system call
-
-@ samba.syscalls.unlink_time Time spent executing unlink system call
-
-@ samba.syscalls.chmod Number of calls to chmod system call
-
-@ samba.syscalls.chmod_time Time spent executing chmod system call
-
-@ samba.syscalls.chown Number of calls to chown system call
-
-@ samba.syscalls.chown_time Time spent executing chown system call
-
-@ samba.syscalls.chdir Number of calls to chdir system call
-
-@ samba.syscalls.chdir_time Time spent executing chdir system call
-
-@ samba.syscalls.getwd Number of calls to getwd system call
-
-@ samba.syscalls.getwd_time Time spent executing getwd system call
-
-@ samba.syscalls.utime Number of calls to utime system call
-
-@ samba.syscalls.utime_time Time spent executing utime system call
-
-@ samba.syscalls.ftruncate Number of calls to ftruncate system call
-
-@ samba.syscalls.ftruncate_time Time spent executing ftruncate system call
-
-@ samba.syscalls.fcntl_lock Number of calls to fcntl_lock system call
-
-@ samba.syscalls.fcntl_lock_time Time spent executing fcntl_lock system call
-
 @ samba.statcache.lookups Number of lookups in stat cache
 
 @ samba.statcache.misses Number of times stat cache lookup missed
@@ -155,199 +59,4 @@
 
 @ samba.writecache.size_change_flush
 
-@ samba.SMB.SMB_mkdir
-@ samba.SMB.SMB_mkdir_time
-@ samba.SMB.SMB_rmdir
-@ samba.SMB.SMB_rmdir_time
-@ samba.SMB.SMB_open
-@ samba.SMB.SMB_open_time
-@ samba.SMB.SMB_create
-@ samba.SMB.SMB_create_time
-@ samba.SMB.SMB_close
-@ samba.SMB.SMB_close_time
-@ samba.SMB.SMB_flush
-@ samba.SMB.SMB_flush_time
-@ samba.SMB.SMB_unlink
-@ samba.SMB.SMB_unlink_time
-@ samba.SMB.SMB_mv
-@ samba.SMB.SMB_mv_time
-@ samba.SMB.SMB_getattr
-@ samba.SMB.SMB_getattr_time
-@ samba.SMB.SMB_setattr
-@ samba.SMB.SMB_setattr_time
-@ samba.SMB.SMB_read
-@ samba.SMB.SMB_read_time
-@ samba.SMB.SMB_write
-@ samba.SMB.SMB_write_time
-@ samba.SMB.SMB_lock
-@ samba.SMB.SMB_lock_time
-@ samba.SMB.SMB_unlock
-@ samba.SMB.SMB_unlock_time
-@ samba.SMB.SMB_ctemp
-@ samba.SMB.SMB_ctemp_time
-@ samba.SMB.SMB_mknew
-@ samba.SMB.SMB_mknew_time
-@ samba.SMB.SMB_chkpth
-@ samba.SMB.SMB_chkpth_time
-@ samba.SMB.SMB_exit
-@ samba.SMB.SMB_exit_time
-@ samba.SMB.SMB_lseek
-@ samba.SMB.SMB_lseek_time
-@ samba.SMB.SMB_lockread
-@ samba.SMB.SMB_lockread_time
-@ samba.SMB.SMB_writeunlock
-@ samba.SMB.SMB_writeunlock_time
-@ samba.SMB.SMB_readBraw
-@ samba.SMB.SMB_readBraw_time
-@ samba.SMB.SMB_readBmpx
-@ samba.SMB.SMB_readBmpx_time
-@ samba.SMB.SMB_readBs
-@ samba.SMB.SMB_readBs_time
-@ samba.SMB.SMB_writeBraw
-@ samba.SMB.SMB_writeBraw_time
-@ samba.SMB.SMB_writeBmpx
-@ samba.SMB.SMB_writeBmpx_time
-@ samba.SMB.SMB_writeBs
-@ samba.SMB.SMB_writeBs_time
-@ samba.SMB.SMB_writec
-@ samba.SMB.SMB_writec_time
-@ samba.SMB.SMB_setattrE
-@ samba.SMB.SMB_setattrE_time
-@ samba.SMB.SMB_getattrE
-@ samba.SMB.SMB_getattrE_time
-@ samba.SMB.SMB_lockingX
-@ samba.SMB.SMB_lockingX_time
-@ samba.SMB.SMB_trans
-@ samba.SMB.SMB_trans_time
-@ samba.SMB.SMB_transs
-@ samba.SMB.SMB_transs_time
-@ samba.SMB.SMB_ioctl
-@ samba.SMB.SMB_ioctl_time
-@ samba.SMB.SMB_ioctls
-@ samba.SMB.SMB_ioctls_time
-@ samba.SMB.SMB_copy
-@ samba.SMB.SMB_copy_time
-@ samba.SMB.SMB_move
-@ samba.SMB.SMB_move_time
-@ samba.SMB.SMB_echo
-@ samba.SMB.SMB_echo_time
-@ samba.SMB.SMB_writeclose
-@ samba.SMB.SMB_writeclose_time
-@ samba.SMB.SMB_openX
-@ samba.SMB.SMB_openX_time
-@ samba.SMB.SMB_readX
-@ samba.SMB.SMB_readX_time
-@ samba.SMB.SMB_writeX
-@ samba.SMB.SMB_writeX_time
-@ samba.SMB.SMB_trans2
-@ samba.SMB.SMB_trans2_time
-@ samba.SMB.SMB_transs2
-@ samba.SMB.SMB_transs2_time
-@ samba.SMB.SMB_findclose
-@ samba.SMB.SMB_findclose_time
-@ samba.SMB.SMB_findNclose
-@ samba.SMB.SMB_findNclose_time
-@ samba.SMB.SMB_tcon
-@ samba.SMB.SMB_tcon_time
-@ samba.SMB.SMB_tdis
-@ samba.SMB.SMB_tdis_time
-@ samba.SMB.SMB_negprot
-@ samba.SMB.SMB_negprot_time
-@ samba.SMB.SMB_sessetupX
-@ samba.SMB.SMB_sessetupX_time
-@ samba.SMB.SMB_ulogoffX
-@ samba.SMB.SMB_ulogoffX_time
-@ samba.SMB.SMB_tconX
-@ samba.SMB.SMB_tconX_time
-@ samba.SMB.SMB_dskattr
-@ samba.SMB.SMB_dskattr_time
-@ samba.SMB.SMB_search
-@ samba.SMB.SMB_search_time
-@ samba.SMB.SMB_ffirst
-@ samba.SMB.SMB_ffirst_time
-@ samba.SMB.SMB_funique
-@ samba.SMB.SMB_funique_time
-@ samba.SMB.SMB_fclose
-@ samba.SMB.SMB_fclose_time
-@ samba.SMB.SMB_NTtrans
-@ samba.SMB.SMB_NTtrans_time
-@ samba.SMB.SMB_NTtranss
-@ samba.SMB.SMB_NTtranss_time
-@ samba.SMB.SMB_NTcreateX
-@ samba.SMB.SMB_NTcreateX_time
-@ samba.SMB.SMB_NTcancel
-@ samba.SMB.SMB_NTcancel_time
-@ samba.SMB.SMB_splopen
-@ samba.SMB.SMB_splopen_time
-@ samba.SMB.SMB_splwrite
-@ samba.SMB.SMB_splwrite_time
-@ samba.SMB.SMB_splclose
-@ samba.SMB.SMB_splclose_time
-@ samba.SMB.SMB_splretq
-@ samba.SMB.SMB_splretq_time
-@ samba.SMB.SMB_sends
-@ samba.SMB.SMB_sends_time
-@ samba.SMB.SMB_sendb
-@ samba.SMB.SMB_sendb_time
-@ samba.SMB.SMB_fwdname
-@ samba.SMB.SMB_fwdname_time
-@ samba.SMB.SMB_cancelf
-@ samba.SMB.SMB_cancelf_time
-@ samba.SMB.SMB_getmach
-@ samba.SMB.SMB_getmach_time
-@ samba.SMB.SMB_sendstrt
-@ samba.SMB.SMB_sendstrt_time
-@ samba.SMB.SMB_sendend
-@ samba.SMB.SMB_sendend_time
-@ samba.SMB.SMB_sendtxt
-@ samba.SMB.SMB_sendtxt_time
-@ samba.SMB.SMB_invalid
-@ samba.SMB.SMB_invalid_time
-@ samba.SMB.PATHWORK_setdir
-@ samba.SMB.PATHWORK_setdir_time
-@ samba.SMB.TRANS2_open
-@ samba.SMB.TRANS2_open_time
-@ samba.SMB.TRANS2_ffirst
-@ samba.SMB.TRANS2_ffirst_time
-@ samba.SMB.TRANS2_fnext
-@ samba.SMB.TRANS2_fnext_time
-@ samba.SMB.TRANS2_qfsinfo
-@ samba.SMB.TRANS2_qfsinfo_time
-@ samba.SMB.TRANS2_sfsinfo
-@ samba.SMB.TRANS2_sfsinfo_time
-@ samba.SMB.TRANS2_qpathinfo
-@ samba.SMB.TRANS2_qpathinfo_time
-@ samba.SMB.TRANS2_spathinfo
-@ samba.SMB.TRANS2_spathinfo_time
-@ samba.SMB.TRANS2_qfileinfo
-@ samba.SMB.TRANS2_qfileinfo_time
-@ samba.SMB.TRANS2_sfileinfo
-@ samba.SMB.TRANS2_sfileinfo_time
-@ samba.SMB.TRANS2_fsctl
-@ samba.SMB.TRANS2_fsctl_time
-@ samba.SMB.TRANS2_ioctl
-@ samba.SMB.TRANS2_ioctl_time
-@ samba.SMB.TRANS2_fnotifyfirst
-@ samba.SMB.TRANS2_fnotifyfirst_time
-@ samba.SMB.TRANS2_fnotifynext
-@ samba.SMB.TRANS2_fnotifynext_time
-@ samba.SMB.TRANS2_mkdir
-@ samba.SMB.TRANS2_mkdir_time
-@ samba.SMB.TRANS2_sessetup
-@ samba.SMB.TRANS2_sessetup_time
-@ samba.SMB.TRANS2_getDFSref
-@ samba.SMB.TRANS2_getDFSref_time
-@ samba.SMB.TRANS2_rptDFSinconsist
-@ samba.SMB.TRANS2_rptDFSinconsist_time
-@ samba.SMB.NTTRANS_create
-@ samba.SMB.NTTRANS_create_time
-@ samba.SMB.NTTRANS_ioctl
-@ samba.SMB.NTTRANS_ioctl_time
-@ samba.SMB.NTTRANS_setsecdesc
-@ samba.SMB.NTTRANS_setsecdesc_time
-@ samba.SMB.NTTRANS_notifychange
-@ samba.SMB.NTTRANS_notifychange_time
-@ samba.SMB.NTTRANS_rename
-@ samba.SMB.NTTRANS_rename_time
-@ samba.SMB.NTTRANS_qsecdesc
-@ samba.SMB.NTTRANS_qsecdesc_time
+@ samba.bytes cumulative number of bytes read or written