xnu-2050.7.9.tar.gz

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

diff --git a/iokit/Kernel/IOKitDebug.cpp b/iokit/Kernel/IOKitDebug.cpp
index b694bcbb3a53a31e0878c2c3a0b004e145d1df66..c170d83a68e962a6acb96d4aabd8ba3a0c47eaf2 100644 (file)
--- a/iokit/Kernel/IOKitDebug.cpp
+++ b/iokit/Kernel/IOKitDebug.cpp
@@ -1,53 +1,70 @@
 /*
 /*

- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2010 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
- */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 
  */
 

+#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 <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>
-
-extern "C" {
-
-SInt64         gIOKitDebug

 #ifdef IOKITDEBUG
 #ifdef IOKITDEBUG

-                            = IOKITDEBUG
+#define DEBUG_INIT_VALUE IOKITDEBUG
+#else
+#define DEBUG_INIT_VALUE 0

 #endif
 #endif

-;
+
+SInt64         gIOKitDebug = DEBUG_INIT_VALUE;
+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;
 
 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
 
 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 )
 {
     IORegistryEntry *          next;
 void IOPrintPlane( const IORegistryPlane * plane )
 {
     IORegistryEntry *          next;


@@ -60,27 +77,35 @@ void IOPrintPlane( const IORegistryPlane * plane )
     assert( iter );
     all = iter->iterateAll();
     if( all) {
     assert( iter );
     all = iter->iterateAll();
     if( all) {

-        IOLog("Count %d\n", all->getCount() );
+        DEBG("Count %d\n", all->getCount() );

         all->release();
     } else
         all->release();
     } else

-       IOLog("Empty\n");
+       DEBG("Empty\n");

 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {
 
     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 )))
        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)))
         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();
 }
 
     }
     iter->release();
 }
 

+void db_piokjunk(void)
+{
+}
+
+void db_dumpiojunk( const IORegistryPlane * plane __unused )
+{
+}
+

 void IOPrintMemory( void )
 {
 
 void IOPrintMemory( void )
 {
 


@@ -134,7 +159,6 @@ void IOKitDiagnostics::updateOffset( OSDictionary * dict,
     off->release();
 }
 
     off->release();
 }
 

-

 bool IOKitDiagnostics::serialize(OSSerialize *s) const
 {
     OSDictionary *     dict;
 bool IOKitDiagnostics::serialize(OSSerialize *s) const
 {
     OSDictionary *     dict;


@@ -147,8 +171,9 @@ bool IOKitDiagnostics::serialize(OSSerialize *s) const
     updateOffset( dict, debug_ivars_size, "Instance allocation" );
     updateOffset( dict, debug_container_malloc_size, "Container allocation" );
     updateOffset( dict, debug_iomalloc_size, "IOMalloc allocation" );
     updateOffset( dict, debug_ivars_size, "Instance allocation" );
     updateOffset( dict, debug_container_malloc_size, "Container allocation" );
     updateOffset( dict, debug_iomalloc_size, "IOMalloc allocation" );

+    updateOffset( dict, debug_iomallocpageable_size, "Pageable allocation" );

 
 

-    dict->setObject( "Classes", OSMetaClass::getClassDictionary() );
+    OSMetaClass::serializeClassDictionary(dict);

 
     ok = dict->serialize( s );
 
 
     ok = dict->serialize( s );