PERFORCE change 170193 for review
Alexander Motin
mav at FreeBSD.org
Wed Nov 4 18:39:34 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=170193
Change 170193 by mav at mav_mavbook on 2009/11/04 18:39:11
Implement device stats accounting for ATA commands.
Affected files ...
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#40 edit
Differences ...
==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#40 (text+ko) ====
@@ -898,7 +898,8 @@
* If the user has supplied a stats structure, and if we understand
* this particular type of ccb, record the transaction start.
*/
- if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO))
+ if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO ||
+ ccb->ccb_h.func_code == XPT_ATA_IO))
devstat_start_transaction(ds, NULL);
xpt_action(ccb);
@@ -921,15 +922,27 @@
/* timeout */0,
/* getcount_only */ FALSE);
- if ((ds != NULL) && (ccb->ccb_h.func_code == XPT_SCSI_IO))
- devstat_end_transaction(ds,
+ if (ds != NULL) {
+ if (ccb->ccb_h.func_code == XPT_SCSI_IO) {
+ devstat_end_transaction(ds,
ccb->csio.dxfer_len,
- ccb->csio.tag_action & 0xf,
+ ccb->csio.tag_action & 0x3,
+ ((ccb->ccb_h.flags & CAM_DIR_MASK) ==
+ CAM_DIR_NONE) ? DEVSTAT_NO_DATA :
+ (ccb->ccb_h.flags & CAM_DIR_OUT) ?
+ DEVSTAT_WRITE :
+ DEVSTAT_READ, NULL, NULL);
+ } else if (ccb->ccb_h.func_code == XPT_ATA_IO) {
+ devstat_end_transaction(ds,
+ ccb->ataio.dxfer_len,
+ ccb->ataio.tag_action & 0x3,
((ccb->ccb_h.flags & CAM_DIR_MASK) ==
CAM_DIR_NONE) ? DEVSTAT_NO_DATA :
(ccb->ccb_h.flags & CAM_DIR_OUT) ?
DEVSTAT_WRITE :
DEVSTAT_READ, NULL, NULL);
+ }
+ }
return(error);
}
More information about the p4-projects
mailing list