Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Move portals into its own CVS module for HEAD.
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
lproc_ptlrpc.c
diff --git
a/lustre/ptlrpc/lproc_ptlrpc.c
b/lustre/ptlrpc/lproc_ptlrpc.c
index
43e650e
..
7054f99
100644
(file)
--- a/
lustre/ptlrpc/lproc_ptlrpc.c
+++ b/
lustre/ptlrpc/lproc_ptlrpc.c
@@
-52,7
+52,7
@@
struct ll_rpc_opcode {
{ OST_SYNC, "ost_sync" },
{ OST_SET_INFO, "ost_set_info" },
{ MDS_GETATTR, "mds_getattr" },
- { MDS_GETATTR_
NAME, "mds_getattr_name
" },
+ { MDS_GETATTR_
LOCK, "mds_getattr_lock
" },
{ MDS_CLOSE, "mds_close" },
{ MDS_REINT, "mds_reint" },
{ MDS_READPAGE, "mds_readpage" },
@@
-69,6
+69,7
@@
struct ll_rpc_opcode {
{ LDLM_CANCEL, "ldlm_cancel" },
{ LDLM_BL_CALLBACK, "ldlm_bl_callback" },
{ LDLM_CP_CALLBACK, "ldlm_cp_callback" },
+ { LDLM_GL_CALLBACK, "ldlm_gl_callback" },
{ PTLBD_QUERY, "ptlbd_query" },
{ PTLBD_READ, "ptlbd_read" },
{ PTLBD_WRITE, "ptlbd_write" },
@@
-107,8
+108,8
@@
void ptlrpc_lprocfs_register(struct proc_dir_entry *root, char *dir,
struct proc_dir_entry *svc_procroot;
struct lprocfs_stats *svc_stats;
int i, rc;
- unsigned int svc_counter_config = LPROCFS_CNTR_
EXTERNALLOCK |
-
LPROCFS_CNTR_AVGMINMAX |
LPROCFS_CNTR_STDDEV;
+ unsigned int svc_counter_config = LPROCFS_CNTR_
AVGMINMAX |
+
LPROCFS_CNTR_STDDEV;
LASSERT(*procroot_ret == NULL);
LASSERT(*stats_ret == NULL);
@@
-123,19
+124,19
@@
void ptlrpc_lprocfs_register(struct proc_dir_entry *root, char *dir,
lprocfs_free_stats(svc_stats);
return;
}
- } else
+ } else
{
svc_procroot = root;
+ }
lprocfs_counter_init(svc_stats, PTLRPC_REQWAIT_CNTR,
svc_counter_config, "req_waittime", "usec");
- /* Wait for b_eq branch
- lprocfs_counter_init(svc_stats, PTLRPC_SVCEQDEPTH_CNTR,
- svc_counter_config, "svc_eqdepth", "reqs");
- */
- /* no stddev on idletime */
- lprocfs_counter_init(svc_stats, PTLRPC_SVCIDLETIME_CNTR,
- (LPROCFS_CNTR_EXTERNALLOCK|LPROCFS_CNTR_AVGMINMAX),
- "svc_idletime", "usec");
+ lprocfs_counter_init(svc_stats, PTLRPC_REQQDEPTH_CNTR,
+ svc_counter_config, "req_qdepth", "reqs");
+ lprocfs_counter_init(svc_stats, PTLRPC_REQACTIVE_CNTR,
+ svc_counter_config, "req_active", "reqs");
+ lprocfs_counter_init(svc_stats, PTLRPC_REQBUF_AVAIL_CNTR,
+ svc_counter_config, "reqbuf_avail", "bufs");
+
for (i = 0; i < LUSTRE_MAX_OPCODES; i++) {
__u32 opcode = ll_rpc_opcode_table[i].opcode;
lprocfs_counter_init(svc_stats, PTLRPC_LAST_CNTR + i,
@@
-159,14
+160,14
@@
void ptlrpc_lprocfs_register_service(struct proc_dir_entry *entry,
struct ptlrpc_service *svc)
{
ptlrpc_lprocfs_register(entry, svc->srv_name,
- "stats", &svc->s
vc_procroot,
- &svc->s
vc
_stats);
+ "stats", &svc->s
rv_procroot,
+ &svc->s
rv
_stats);
}
void ptlrpc_lprocfs_register_obd(struct obd_device *obddev)
{
- ptlrpc_lprocfs_register(obddev->obd_proc_entry, NULL, "stats",
- &obddev->obd_svc_procroot,
+ ptlrpc_lprocfs_register(obddev->obd_proc_entry, NULL, "stats",
+ &obddev->obd_svc_procroot,
&obddev->obd_svc_stats);
}
@@
-184,13
+185,13
@@
void ptlrpc_lprocfs_rpc_sent(struct ptlrpc_request *req)
void ptlrpc_lprocfs_unregister_service(struct ptlrpc_service *svc)
{
- if (svc->s
vc_procroot
) {
- lprocfs_remove(svc->s
vc
_procroot);
- svc->s
vc
_procroot = NULL;
+ if (svc->s
rv_procroot != NULL
) {
+ lprocfs_remove(svc->s
rv
_procroot);
+ svc->s
rv
_procroot = NULL;
}
- if (svc->s
vc
_stats) {
- lprocfs_free_stats(svc->s
vc
_stats);
- svc->s
vc
_stats = NULL;
+ if (svc->s
rv
_stats) {
+ lprocfs_free_stats(svc->s
rv
_stats);
+ svc->s
rv
_stats = NULL;
}
}
void ptlrpc_lprocfs_unregister_obd(struct obd_device *obd)