Loading...
libkern/c++/OSMetaClass.cpp xnu-124.7 xnu-517.12.7
--- xnu/xnu-124.7/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-517.12.7/libkern/c++/OSMetaClass.cpp
@@ -46,6 +46,7 @@
 #include <kern/lock.h>
 #include <kern/clock.h>
 #include <kern/thread_call.h>
+#include <kern/host.h>
 #include <mach/kmod.h>
 #include <mach/mach_interface.h>
 
@@ -84,12 +85,16 @@
 static const char OSMetaClassBasePanicMsg[] =
     "OSMetaClassBase::_RESERVEDOSMetaClassBase%d called\n";
 
+#if SLOT_USED
 void OSMetaClassBase::_RESERVEDOSMetaClassBase0()
     { panic(OSMetaClassBasePanicMsg, 0); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase1()
     { panic(OSMetaClassBasePanicMsg, 1); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase2()
     { panic(OSMetaClassBasePanicMsg, 2); }
+#endif /* SLOT_USED */
+
+// As these slots are used move them up inside the #if above
 void OSMetaClassBase::_RESERVEDOSMetaClassBase3()
     { panic(OSMetaClassBasePanicMsg, 3); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase4()
@@ -98,6 +103,28 @@
     { panic(OSMetaClassBasePanicMsg, 5); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase6()
     { panic(OSMetaClassBasePanicMsg, 6); }
+    
+/*
+ * These used to be inline in the header but gcc didn't believe us
+ * Now we MUST pull the inline out at least until the compiler is
+ * repaired.
+ */
+// Helper inlines for runtime type preprocessor macros
+OSMetaClassBase *OSMetaClassBase::
+safeMetaCast(const OSMetaClassBase *me, const OSMetaClass *toType)
+    { return (me)? me->metaCast(toType) : 0; }
+
+bool OSMetaClassBase::
+checkTypeInst(const OSMetaClassBase *inst, const OSMetaClassBase *typeinst)
+{
+    const OSMetaClass *toType = OSTypeIDInst(typeinst);
+    return typeinst && inst && (0 != inst->metaCast(toType));
+}
+
+
+// If you need this slot you had better setup an IOCTL style interface.
+// 'Cause the whole kernel world depends on OSMetaClassBase and YOU
+// CANT change the VTABLE size ever.
 void OSMetaClassBase::_RESERVEDOSMetaClassBase7()
     { panic(OSMetaClassBasePanicMsg, 7); }
 
@@ -141,7 +168,7 @@
 
 OSMetaClassBase *OSMetaClassBase::metaCast(const char *toMetaCStr) const
 {
-    const OSSymbol *tempSymb = OSSymbol::withCStringNoCopy(toMetaCStr);
+    const OSSymbol *tempSymb = OSSymbol::withCString(toMetaCStr);
     OSMetaClassBase *ret = 0;
     if (tempSymb) {
         ret = metaCast(tempSymb);
@@ -296,12 +323,13 @@
     }
 }
 
-// Don't do anything as these classes must be statically allocated
 void *OSMetaClass::operator new(size_t size) { return 0; }
-void OSMetaClass::operator delete(void *mem, size_t size) { }
 void OSMetaClass::retain() const { }
 void OSMetaClass::release() const { }
-void OSMetaClass::release(int when) const { };
+void OSMetaClass::release(int when) const { }
+void OSMetaClass::taggedRetain(const void *tag) const { }
+void OSMetaClass::taggedRelease(const void *tag) const { }
+void OSMetaClass::taggedRelease(const void *tag, const int when) const { }
 int  OSMetaClass::getRetainCount() const { return 0; }
 
 const char *OSMetaClass::getClassName() const
@@ -318,10 +346,10 @@
 {
     if (!loadLock) {
         loadLock = mutex_alloc(ETAP_IO_AHA);
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
     }
     else
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
 
     sStalled = (StalledData *) kalloc(sizeof(*sStalled));
     if (sStalled) {
@@ -464,10 +492,10 @@
 
     if (!loadLock) {
         loadLock = mutex_alloc(ETAP_IO_AHA);
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
     }
     else
-	_mutex_lock(loadLock);
+	mutex_lock(loadLock);
 
     do {
 	OSSet *kmodClasses;
@@ -523,6 +551,8 @@
     iter->release();
 }
 
+extern "C" kern_return_t kmod_unload_cache(void);
+
 static void _OSMetaClassConsiderUnloads(thread_call_param_t p0,
                                         thread_call_param_t p1)
 {
@@ -531,11 +561,11 @@
     OSCollectionIterator *kmods;
     OSCollectionIterator *classes;
     OSMetaClass *checkClass;
-    kmod_info_t *ki;
+    kmod_info_t *ki = 0;
     kern_return_t ret;
     bool didUnload;
 
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
 
     do {
 
@@ -546,12 +576,18 @@
         didUnload = false;
         while ( (kmodName = (OSSymbol *) kmods->getNextObject()) ) {
 
-            ki = kmod_lookupbyname((char *)kmodName->getCStringNoCopy());
+            if (ki) {
+                kfree((vm_offset_t) ki, sizeof(kmod_info_t));
+                ki = 0;
+            }
+
+            ki = kmod_lookupbyname_locked((char *)kmodName->getCStringNoCopy());
             if (!ki)
                 continue;
 
-            if (ki->reference_count)
-                continue;
+            if (ki->reference_count) {
+                 continue;
+            }
 
             kmodClasses = OSDynamicCast(OSSet,
                                 sKModClassesDict->getObject(kmodName));
@@ -570,13 +606,15 @@
                 didUnload = true;
             }
 
-        } while (false);
+        }
 
         kmods->release();
 
     } while (didUnload);
 
     mutex_unlock(loadLock);
+
+    kmod_unload_cache();
 }
 
 void OSMetaClass::considerUnloads()
@@ -584,7 +622,7 @@
     static thread_call_t unloadCallout;
     AbsoluteTime when;
 
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
 
     if (!unloadCallout)
         unloadCallout = thread_call_allocate(&_OSMetaClassConsiderUnloads, 0);
@@ -630,7 +668,7 @@
 OSObject *OSMetaClass::allocClassWithName(const OSSymbol *name)
 {
     OSObject * result;
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
 
     const OSMetaClass * const meta = getMetaClassWithName(name);
 
@@ -665,7 +703,7 @@
 checkMetaCastWithName(const OSSymbol *name, const OSMetaClassBase *in)
 {
     OSMetaClassBase * result;
-    _mutex_lock(loadLock);
+    mutex_lock(loadLock);
     const OSMetaClass * const meta = getMetaClassWithName(name);
 
     if (meta)
@@ -764,31 +802,50 @@
 
 OSDictionary * OSMetaClass::getClassDictionary()
 {
-    return sAllClassesDict;
+    panic("OSMetaClass::getClassDictionary(): Obsoleted\n");
+    return 0;
 }
 
 bool OSMetaClass::serialize(OSSerialize *s) const
 {
-    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;
-}
-
+    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();
+}