xnu-1699.22.81.tar.gz

[apple/xnu.git] / iokit / Kernel / IOCommandQueue.cpp

diff --git a/iokit/Kernel/IOCommandQueue.cpp b/iokit/Kernel/IOCommandQueue.cpp
index e2cd65b4e601725a80a0a2248c820a78d9b1c673..3a184bf945280d9765360a50efbdfeadc8ad435c 100644 (file)
--- a/iokit/Kernel/IOCommandQueue.cpp
+++ b/iokit/Kernel/IOCommandQueue.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,22 +25,30 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/*
-Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
-
-HISTORY
-    1998-7-13  Godfrey van der Linden(gvdl)
-        Created.
-]*/
 
 #if !defined(__LP64__)
 
 #include <IOKit/IOCommandQueue.h>
 #include <IOKit/IOWorkLoop.h>
 #include <IOKit/IOTimeStamp.h>
+#include <IOKit/IOKitDebug.h>
 
 #include <mach/sync_policy.h>
 
+#if IOKITSTATS
+
+#define IOStatisticsInitializeCounter() \
+       IOStatistics::setCounterType(reserved->counter, kIOStatisticsCommandQueueCounter)
+
+#define IOStatisticsActionCall() \
+       IOStatistics::countCommandQueueActionCall(reserved->counter)
+
+#else
+
+#define IOStatisticsInitializeCounter()
+#define IOStatisticsActionCall()
+
+#endif /* IOKITSTATS */
 
 #define NUM_FIELDS_IN_COMMAND  4
 typedef struct commandEntryTag {
@@ -93,6 +101,8 @@ bool IOCommandQueue::init(OSObject *inOwner,
 
     producerIndex = consumerIndex = 0;
 
+    IOStatisticsInitializeCounter();
+
     return true;
 }
 
@@ -136,7 +146,8 @@ void IOCommandQueue::free()
 
 bool IOCommandQueue::checkForWork()
 {
-    void *field0, *field1, *field2, *field3;
+    void       *field0, *field1, *field2, *field3;
+       bool    trace = ( gIOKitTrace & kIOTraceCommandGates ) ? true : false;
 
     if (!enabled || consumerIndex == producerIndex)
         return false;
@@ -153,11 +164,17 @@ bool IOCommandQueue::checkForWork()
     if (++consumerIndex >= size)
         consumerIndex = 0;
 
-    IOTimeStampConstant(IODBG_CMDQ(IOCMDQ_ACTION),
-                       (uintptr_t) action, (uintptr_t) owner);
-
+       if (trace)
+               IOTimeStampStartConstant(IODBG_CMDQ(IOCMDQ_ACTION),
+                                                                (uintptr_t) action, (uintptr_t) owner);
+       
+    IOStatisticsActionCall();
     (*(IOCommandQueueAction) action)(owner, field0, field1, field2, field3);
-
+       
+       if (trace)
+               IOTimeStampEndConstant(IODBG_CMDQ(IOCMDQ_ACTION),
+                                                          (uintptr_t) action, (uintptr_t) owner);
+       
     return (consumerIndex != producerIndex);
 }