X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..e2d2fc5c71f7d145cba7267989251af45e3bb5ba:/iokit/Kernel/IOKitDebug.cpp?ds=inline

diff --git a/iokit/Kernel/IOKitDebug.cpp b/iokit/Kernel/IOKitDebug.cpp
index 9d3a9b773..21048d88c 100644
--- a/iokit/Kernel/IOKitDebug.cpp
+++ b/iokit/Kernel/IOKitDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,24 +25,18 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
 
 #include <sys/sysctl.h>
 
+#include <libkern/c++/OSContainers.h>
+#include <libkern/c++/OSCPPDebug.h>
+
 #include <IOKit/IOKitDebug.h>
 #include <IOKit/IOLib.h>
 #include <IOKit/assert.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOService.h>
 
-#include <libkern/c++/OSContainers.h>
-#include <libkern/c++/OSCPPDebug.h>
-
 #ifdef IOKITDEBUG
 #define DEBUG_INIT_VALUE IOKITDEBUG
 #else
@@ -50,17 +44,26 @@
 #endif
 
 SInt64		gIOKitDebug = DEBUG_INIT_VALUE;
-SYSCTL_QUAD(_debug, OID_AUTO, iokit, CTLFLAG_RW, &gIOKitDebug, "boot_arg io");
+SInt64		gIOKitTrace = 0;
+
+SYSCTL_QUAD(_debug, OID_AUTO, iokit, CTLFLAG_RW | CTLFLAG_LOCKED, &gIOKitDebug, "boot_arg io");
+SYSCTL_QUAD(_debug, OID_AUTO, iotrace, CTLFLAG_RW | CTLFLAG_LOCKED, &gIOKitTrace, "trace io");
 
 
 int 		debug_malloc_size;
 int		debug_iomalloc_size;
+
 vm_size_t	debug_iomallocpageable_size;
 int 		debug_container_malloc_size;
 // int 		debug_ivars_size; // in OSObject.cpp
 
 extern "C" {
 
+#if 0
+#define DEBG(fmt, args...)   { kprintf(fmt, ## args); }
+#else
+#define DEBG(fmt, args...)   { IOLog(fmt, ## args); }
+#endif
 
 void IOPrintPlane( const IORegistryPlane * plane )
 {
@@ -74,28 +77,28 @@ void IOPrintPlane( const IORegistryPlane * plane )
     assert( iter );
     all = iter->iterateAll();
     if( all) {
-        IOLog("Count %d\n", all->getCount() );
+        DEBG("Count %d\n", all->getCount() );
         all->release();
     } else
-	IOLog("Empty\n");
+	DEBG("Empty\n");
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {
-	sprintf( format + 1, "%ds", 2 * next->getDepth( plane ));
-	IOLog( format, "");
-	IOLog( "\033[33m%s", next->getName( plane ));
+	snprintf(format + 1, sizeof(format) - 1, "%ds", 2 * next->getDepth( plane ));
+	DEBG( format, "");
+	DEBG( "\033[33m%s", next->getName( plane ));
 	if( (next->getLocation( plane )))
-            IOLog("@%s", next->getLocation( plane ));
-	IOLog("\033[0m <class %s", next->getMetaClass()->getClassName());
+            DEBG("@%s", next->getLocation( plane ));
+	DEBG("\033[0m <class %s", next->getMetaClass()->getClassName());
         if( (service = OSDynamicCast(IOService, next)))
-            IOLog(", busy %ld", service->getBusyState());
-	IOLog( ">\n");
-	IOSleep(250);
+            DEBG(", busy %ld", (long) service->getBusyState());
+	DEBG( ">\n");
+//	IOSleep(250);
     }
     iter->release();
 }
 
-void dbugprintf(char *fmt, ...);
+void dbugprintf(const char *fmt, ...);
 void db_dumpiojunk( const IORegistryPlane * plane );
 
 void db_piokjunk(void) {
@@ -137,7 +140,7 @@ void db_dumpiojunk( const IORegistryPlane * plane )
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {
-		sprintf( format + 1, "%ds", 2 * next->getDepth( plane ));
+		snprintf(format + 1, sizeof(format) - 1, "%ds", 2 * next->getDepth( plane ));
 		dbugprintf( format, "");
 		dbugprintf( "%s", next->getName( plane ));
 		if( (next->getLocation( plane )))
@@ -203,7 +206,6 @@ void IOKitDiagnostics::updateOffset( OSDictionary * dict,
     off->release();
 }
 
-
 bool IOKitDiagnostics::serialize(OSSerialize *s) const
 {
     OSDictionary * 	dict;