#include "ptlrpc_internal.h"
-struct ll_rpc_opcode {
+struct ll_rpc_opcode {
__u32 opcode;
const char *opname;
} ll_rpc_opcode_table[LUSTRE_MAX_OPCODES] = {
{ OST_STATFS, "ost_statfs" },
{ OST_SAN_READ, "ost_san_read" },
{ OST_SAN_WRITE, "ost_san_write" },
- { OST_SYNCFS, "ost_syncfs" },
+ { 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" },
{ MDS_DISCONNECT, "mds_disconnect" },
{ MDS_GETSTATUS, "mds_getstatus" },
{ MDS_STATFS, "mds_statfs" },
- { MDS_GETLOVINFO, "mds_getlovinfo" },
+ { MDS_PIN, "mds_pin" },
+ { MDS_UNPIN, "mds_unpin" },
+ { MDS_SYNC, "mds_sync" },
+ { MDS_DONE_WRITING, "mds_done_writing" },
{ LDLM_ENQUEUE, "ldlm_enqueue" },
{ LDLM_CONVERT, "ldlm_convert" },
{ 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" },
{ PTLBD_FLUSH, "ptlbd_flush" },
- { OBD_PING, "obd_ping" }
+ { PTLBD_CONNECT, "ptlbd_connect" },
+ { PTLBD_DISCONNECT, "ptlbd_disconnect" },
+ { OBD_PING, "obd_ping" },
+ { OBD_LOG_CANCEL, "llog_origin_handle_cancel"},
+ { SEC_INIT, "sec_init"},
+ { SEC_INIT_CONTINUE,"sec_init_continue"},
+ { SEC_FINI, "sec_fini"},
};
const char* ll_opcode2str(__u32 opcode)
/* When one of the assertions below fail, chances are that:
* 1) A new opcode was added in lustre_idl.h, but was
* is missing from the table above.
- * or 2) The opcode space was renumbered or rearranged,
- * and the opcode_offset() function in
+ * or 2) The opcode space was renumbered or rearranged,
+ * and the opcode_offset() function in
* ptlrpc_internals.h needs to be modified.
*/
__u32 offset = opcode_offset(opcode);
void ptlrpc_lprocfs_unregister_service(struct ptlrpc_service *svc) { return; }
#else
-void ptlrpc_lprocfs_register_service(struct obd_device *obddev,
- struct ptlrpc_service *svc)
+void ptlrpc_lprocfs_register(struct proc_dir_entry *root, char *dir,
+ char *name, struct proc_dir_entry **procroot_ret,
+ struct lprocfs_stats **stats_ret)
{
- struct proc_dir_entry *svc_procroot;
- struct lprocfs_counters *svc_cntrs;
+ 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(svc->svc_procroot == NULL);
- LASSERT(svc->svc_counters == NULL);
+ LASSERT(*procroot_ret == NULL);
+ LASSERT(*stats_ret == NULL);
- svc_procroot = lprocfs_register(svc->srv_name, obddev->obd_proc_entry,
- NULL, NULL);
- if (svc_procroot == NULL)
- return;
-
- svc_cntrs =
- lprocfs_alloc_counters(PTLRPC_LAST_CNTR+LUSTRE_MAX_OPCODES);
- if (svc_cntrs == NULL) {
- lprocfs_remove(svc_procroot);
+ svc_stats = lprocfs_alloc_stats(PTLRPC_LAST_CNTR + LUSTRE_MAX_OPCODES);
+ if (svc_stats == NULL)
return;
+
+ if (dir) {
+ svc_procroot = lprocfs_register(dir, root, NULL, NULL);
+ if (IS_ERR(svc_procroot)) {
+ lprocfs_free_stats(svc_stats);
+ return;
+ }
+ } else {
+ svc_procroot = root;
}
-
- LPROCFS_COUNTER_INIT(&svc_cntrs->cntr[PTLRPC_REQWAIT_CNTR],
- svc_counter_config, &svc->srv_lock,
- "req_waittime", "cycles");
- LPROCFS_COUNTER_INIT(&svc_cntrs->cntr[PTLRPC_SVCEQDEPTH_CNTR],
- svc_counter_config, &svc->srv_lock,
- "svc_eqdepth", "reqs");
- /* no stddev on idletime */
- LPROCFS_COUNTER_INIT(&svc_cntrs->cntr[PTLRPC_SVCIDLETIME_CNTR],
- (LPROCFS_CNTR_EXTERNALLOCK | LPROCFS_CNTR_AVGMINMAX),
- &svc->srv_lock, "svc_idletime", "cycles");
- for (i=0; i < LUSTRE_MAX_OPCODES; i++) {
+
+ lprocfs_counter_init(svc_stats, PTLRPC_REQWAIT_CNTR,
+ svc_counter_config, "req_waittime", "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_cntrs->cntr[PTLRPC_LAST_CNTR+i],
- svc_counter_config, &svc->srv_lock,
- ll_opcode2str(opcode), "cycles");
+ lprocfs_counter_init(svc_stats, PTLRPC_LAST_CNTR + i,
+ svc_counter_config, ll_opcode2str(opcode),
+ "usec");
}
- rc = lprocfs_register_counters(svc_procroot, "service_stats",
- svc_cntrs);
+
+ rc = lprocfs_register_stats(svc_procroot, name, svc_stats);
if (rc < 0) {
- lprocfs_remove(svc_procroot);
- lprocfs_free_counters(svc_cntrs);
+ if (dir)
+ lprocfs_remove(svc_procroot);
+ lprocfs_free_stats(svc_stats);
} else {
- svc->svc_procroot = svc_procroot;
- svc->svc_counters = svc_cntrs;
+ if (dir)
+ *procroot_ret = svc_procroot;
+ *stats_ret = svc_stats;
}
}
+void ptlrpc_lprocfs_register_service(struct proc_dir_entry *entry,
+ struct ptlrpc_service *svc)
+{
+ ptlrpc_lprocfs_register(entry, svc->srv_name,
+ "stats", &svc->srv_procroot,
+ &svc->srv_stats);
+}
+
+void ptlrpc_lprocfs_register_obd(struct obd_device *obddev)
+{
+ ptlrpc_lprocfs_register(obddev->obd_proc_entry, NULL, "stats",
+ &obddev->obd_svc_procroot,
+ &obddev->obd_svc_stats);
+}
+
+void ptlrpc_lprocfs_rpc_sent(struct ptlrpc_request *req)
+{
+ struct lprocfs_stats *svc_stats;
+ int opc = opcode_offset(req->rq_reqmsg->opc);
+
+ svc_stats = req->rq_import->imp_obd->obd_svc_stats;
+ if (svc_stats == NULL || opc <= 0)
+ return;
+ LASSERT(opc < LUSTRE_MAX_OPCODES);
+ lprocfs_counter_add(svc_stats, opc + PTLRPC_LAST_CNTR, 0);
+}
+
void ptlrpc_lprocfs_unregister_service(struct ptlrpc_service *svc)
{
- if (svc->svc_procroot) {
- lprocfs_remove(svc->svc_procroot);
- svc->svc_procroot = NULL;
+ if (svc->srv_procroot != NULL) {
+ lprocfs_remove(svc->srv_procroot);
+ svc->srv_procroot = NULL;
+ }
+ if (svc->srv_stats) {
+ lprocfs_free_stats(svc->srv_stats);
+ svc->srv_stats = NULL;
+ }
+}
+void ptlrpc_lprocfs_unregister_obd(struct obd_device *obd)
+{
+ if (obd->obd_svc_procroot) {
+ lprocfs_remove(obd->obd_svc_procroot);
+ obd->obd_svc_procroot = NULL;
}
- if (svc->svc_counters) {
- lprocfs_free_counters(svc->svc_counters);
- svc->svc_counters = NULL;
+ if (obd->obd_svc_stats) {
+ lprocfs_free_stats(obd->obd_svc_stats);
+ obd->obd_svc_stats = NULL;
}
}
#endif /* LPROCFS */