--- xnu/xnu-792/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-344.34/libkern/c++/OSMetaClass.cpp
@@ -22,6 +22,7 @@
 /* OSMetaClass.cpp created by gvdl on Fri 1998-11-17 */
 
 #include <string.h>
+#include <sys/systm.h>
 
 #include <libkern/OSReturn.h>
 
@@ -40,8 +41,8 @@
 
 __BEGIN_DECLS
 
-#include <sys/systm.h>
 #include <mach/mach_types.h>
+#include <mach/etap_events.h>
 #include <kern/lock.h>
 #include <kern/clock.h>
 #include <kern/thread_call.h>
@@ -68,7 +69,7 @@
 
 static const int kClassCapacityIncrement = 40;
 static const int kKModCapacityIncrement = 10;
-static OSDictionary *sAllClassesDict, *sKModClassesDict, *sSortedByClassesDict;
+static OSDictionary *sAllClassesDict, *sKModClassesDict;
 
 static mutex_t *loadLock;
 static struct StalledData {
@@ -285,10 +286,8 @@
     do {
 	OSCollectionIterator *iter;
 
-	if (sAllClassesDict) {
+	if (sAllClassesDict)
 	    sAllClassesDict->removeObject(className);
-	    className->release();
-	}
 
 	iter = OSCollectionIterator::withCollection(sKModClassesDict);
 	if (!iter)
@@ -320,6 +319,7 @@
 		memmove(&sStalled->classes[i], &sStalled->classes[i+1],
 			    (sStalled->count - i) * sizeof(OSMetaClass *));
 	}
+	return;
     }
 }
 
@@ -345,7 +345,7 @@
 void *OSMetaClass::preModLoad(const char *kmodName)
 {
     if (!loadLock) {
-        loadLock = mutex_alloc(0);
+        loadLock = mutex_alloc(ETAP_IO_AHA);
 	mutex_lock(loadLock);
     }
     else
@@ -381,7 +381,6 @@
 {
     OSReturn result = kOSReturnSuccess;
     OSSet *kmodSet = 0;
-    OSSymbol *myname = 0;
 
     if (!sStalled || loadHandle != sStalled) {
 	logError(kOSMetaClassInternal);
@@ -398,8 +397,7 @@
     case kMakingDictionaries:
 	sKModClassesDict = OSDictionary::withCapacity(kKModCapacityIncrement);
 	sAllClassesDict = OSDictionary::withCapacity(kClassCapacityIncrement);
-	sSortedByClassesDict = OSDictionary::withCapacity(kClassCapacityIncrement);
-	if (!sAllClassesDict || !sKModClassesDict || !sSortedByClassesDict) {
+	if (!sAllClassesDict || !sKModClassesDict) {
 	    result = kOSMetaClassNoDicts;
 	    break;
 	}
@@ -408,7 +406,6 @@
     case kCompletedBootstrap:
     {
         unsigned int i;
-        myname = OSSymbol::withCStringNoCopy(sStalled->kmodName);
 
 	if (!sStalled->count)
 	    break;	// Nothing to do so just get out
@@ -432,20 +429,19 @@
 	    break;
 	}
 
-	if (!sKModClassesDict->setObject(myname, kmodSet)) {
+	if (!sKModClassesDict->setObject(sStalled->kmodName, kmodSet)) {
 	    result = kOSMetaClassNoInsKModSet;
 	    break;
 	}
 
 	// Second pass symbolling strings and inserting classes in dictionary
-	for (i = 0; i < sStalled->count; i++) {
+	for (unsigned int i = 0; i < sStalled->count; i++) {
 	    OSMetaClass *me = sStalled->classes[i];
 	    me->className = 
                 OSSymbol::withCStringNoCopy((const char *) me->className);
 
 	    sAllClassesDict->setObject(me->className, me);
 	    kmodSet->setObject(me);
-	    sSortedByClassesDict->setObject((const OSSymbol *)me, myname);
 	}
 	sBootstrapState = kCompletedBootstrap;
 	break;
@@ -458,9 +454,6 @@
 
     if (kmodSet)
 	kmodSet->release();
-
-	if (myname)
-	myname->release();
 
     if (sStalled) {
 	ACCUMSIZE(-(sStalled->capacity * sizeof(OSMetaClass *)
@@ -498,7 +491,7 @@
     bool result = false;
 
     if (!loadLock) {
-        loadLock = mutex_alloc(0);
+        loadLock = mutex_alloc(ETAP_IO_AHA);
 	mutex_lock(loadLock);
     }
     else
@@ -557,8 +550,6 @@
 
     iter->release();
 }
-
-extern "C" kern_return_t kmod_unload_cache(void);
 
 static void _OSMetaClassConsiderUnloads(thread_call_param_t p0,
                                         thread_call_param_t p1)
@@ -584,7 +575,7 @@
         while ( (kmodName = (OSSymbol *) kmods->getNextObject()) ) {
 
             if (ki) {
-                kfree((vm_offset_t) ki, sizeof(kmod_info_t));
+                kfree(ki, sizeof(kmod_info_t));
                 ki = 0;
             }
 
@@ -620,8 +611,6 @@
     } while (didUnload);
 
     mutex_unlock(loadLock);
-
-    kmod_unload_cache();
 }
 
 void OSMetaClass::considerUnloads()
@@ -778,11 +767,6 @@
     return superClassLink;
 }
 
-const OSSymbol *OSMetaClass::getKmodName() const
-{	
-    return sSortedByClassesDict->getObject((const OSSymbol *)this);
-}
-
 unsigned int OSMetaClass::getInstanceCount() const
 {
     return instanceCount;
@@ -814,50 +798,31 @@
 
 OSDictionary * OSMetaClass::getClassDictionary()
 {
-    panic("OSMetaClass::getClassDictionary(): Obsoleted\n");
-    return 0;
+    return sAllClassesDict;
 }
 
 bool OSMetaClass::serialize(OSSerialize *s) const
 {
-    panic("OSMetaClass::serialize(): Obsoleted\n");
-    return false;
-}
-
-void OSMetaClass::serializeClassDictionary(OSDictionary *serializeDictionary)
-{
-    OSDictionary *classDict;
-
-    classDict = OSDictionary::withCapacity(sAllClassesDict->getCount());
-    if (!classDict)
-        return;
-
-    mutex_lock(loadLock);
-    do {
-        OSCollectionIterator *classes;
-        const OSSymbol *className;
-
-        classes = OSCollectionIterator::withCollection(sAllClassesDict);
-        if (!classes)
-            break;
-    
-        while ((className = (const OSSymbol *) classes->getNextObject())) {
-            const OSMetaClass *meta;
-            OSNumber *count;
-
-            meta = (OSMetaClass *) sAllClassesDict->getObject(className);
-            count = OSNumber::withNumber(meta->getInstanceCount(), 32);
-            if (count) {
-                classDict->setObject(className, count);
-                count->release();
-            }
-        }
-        classes->release();
-
-        serializeDictionary->setObject("Classes", classDict);
-    } while (0);
-
-    mutex_unlock(loadLock);
-
-    classDict->release();
-}
+    OSDictionary *	dict;
+    OSNumber *		off;
+    bool		ok = false;
+
+    if (s->previouslySerialized(this)) return true;
+
+    dict = 0;// IODictionary::withCapacity(2);
+    off = OSNumber::withNumber(getInstanceCount(), 32);
+
+    if (dict) {
+	dict->setObject("InstanceCount", off );
+	ok = dict->serialize(s);
+    } else if( off)
+	ok = off->serialize(s);
+
+    if (dict)
+	dict->release();
+    if (off)
+	off->release();
+
+    return ok;
+}
+