svn commit: r291920 - head/sys/cam

[Warner Losh]

Author: imp
Date: Mon Dec  7 04:14:29 2015
New Revision: 291920
URL: https://svnweb.freebsd.org/changeset/base/291920

Log:
  Improve cam tracing a little by including the function code in the
  traces for xpt_action. Note up-calls (down-calls?) to the SIM as well.
  
  Differential Review: https://reviews.freebsd.org/D4382

Modified:
  head/sys/cam/cam_xpt.c

Modified: head/sys/cam/cam_xpt.c
==============================================================================
--- head/sys/cam/cam_xpt.c	Mon Dec  7 04:03:01 2015	(r291919)
+++ head/sys/cam/cam_xpt.c	Mon Dec  7 04:14:29 2015	(r291920)
@@ -2450,7 +2450,8 @@ void
 xpt_action(union ccb *start_ccb)
 {
 
-	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_action\n"));
+	CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE,
+	    ("xpt_action: func=%#x\n", start_ccb->ccb_h.func_code));
 
 	start_ccb->ccb_h.status = CAM_REQ_INPROG;
 	(*(start_ccb->ccb_h.path->bus->xport->action))(start_ccb);
@@ -2464,7 +2465,8 @@ xpt_action_default(union ccb *start_ccb)
 	int lock;
 
 	path = start_ccb->ccb_h.path;
-	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_action_default\n"));
+	CAM_DEBUG(path, CAM_DEBUG_TRACE,
+	    ("xpt_action_default: func=%#x\n", start_ccb->ccb_h.func_code));
 
 	switch (start_ccb->ccb_h.func_code) {
 	case XPT_SCSI_IO:
@@ -2618,7 +2620,11 @@ call_sim:
 		lock = (mtx_owned(sim->mtx) == 0);
 		if (lock)
 			CAM_SIM_LOCK(sim);
+		CAM_DEBUG(path, CAM_DEBUG_TRACE,
+		    ("sim->sim_action: func=%#x\n", start_ccb->ccb_h.func_code));
 		(*(sim->sim_action))(sim, start_ccb);
+		CAM_DEBUG(path, CAM_DEBUG_TRACE,
+		    ("sim->sim_action: status=%#x\n", start_ccb->ccb_h.status));
 		if (lock)
 			CAM_SIM_UNLOCK(sim);
 		break;