Loading...
--- xnu/xnu-792.13.8/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-517.7.7/libkern/c++/OSMetaClass.cpp
@@ -1,35 +1,28 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
*
- * 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.
- *
- * 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,
- * 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_OSREFERENCE_HEADER_END@
+ * 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 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,
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
*/
/* OSMetaClass.cpp created by gvdl on Fri 1998-11-17 */
#include <string.h>
+#include <sys/systm.h>
#include <libkern/OSReturn.h>
@@ -46,13 +39,10 @@
#include <libkern/c++/OSLib.h>
#include <libkern/OSAtomic.h>
-#include <IOKit/pwr_mgt/RootDomain.h>
-#include <IOKit/IOMessage.h>
-
__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>
@@ -79,9 +69,9 @@
static const int kClassCapacityIncrement = 40;
static const int kKModCapacityIncrement = 10;
-static OSDictionary *sAllClassesDict, *sKModClassesDict, *sSortedByClassesDict;
-
-static mutex_t *loadLock = 0;
+static OSDictionary *sAllClassesDict, *sKModClassesDict;
+
+static mutex_t *loadLock;
static struct StalledData {
const char *kmodName;
OSReturn result;
@@ -91,8 +81,6 @@
} *sStalled;
static unsigned int sConsiderUnloadDelay = 60; /* secs */
-static bool unloadsEnabled = true; // set to false when system going to sleep
-static thread_call_t unloadCallout = 0;
static const char OSMetaClassBasePanicMsg[] =
"OSMetaClassBase::_RESERVEDOSMetaClassBase%d called\n";
@@ -285,7 +273,7 @@
sStalled->capacity += kKModCapacityIncrement;
memmove(sStalled->classes, oldStalled, oldSize);
- kfree(oldStalled, oldSize);
+ kfree((vm_offset_t)oldStalled, oldSize);
ACCUMSIZE(newSize - oldSize);
}
@@ -298,10 +286,8 @@
do {
OSCollectionIterator *iter;
- if (sAllClassesDict) {
+ if (sAllClassesDict)
sAllClassesDict->removeObject(className);
- className->release();
- }
iter = OSCollectionIterator::withCollection(sKModClassesDict);
if (!iter)
@@ -333,6 +319,7 @@
memmove(&sStalled->classes[i], &sStalled->classes[i+1],
(sStalled->count - i) * sizeof(OSMetaClass *));
}
+ return;
}
}
@@ -358,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
@@ -369,7 +356,7 @@
sStalled->classes = (OSMetaClass **)
kalloc(kKModCapacityIncrement * sizeof(OSMetaClass *));
if (!sStalled->classes) {
- kfree(sStalled, sizeof(*sStalled));
+ kfree((vm_offset_t) sStalled, sizeof(*sStalled));
return 0;
}
ACCUMSIZE((kKModCapacityIncrement * sizeof(OSMetaClass *)) + sizeof(*sStalled));
@@ -394,7 +381,6 @@
{
OSReturn result = kOSReturnSuccess;
OSSet *kmodSet = 0;
- OSSymbol *myname = 0;
if (!sStalled || loadHandle != sStalled) {
logError(kOSMetaClassInternal);
@@ -411,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;
}
@@ -421,7 +406,6 @@
case kCompletedBootstrap:
{
unsigned int i;
- myname = (OSSymbol *)OSSymbol::withCStringNoCopy(sStalled->kmodName);
if (!sStalled->count)
break; // Nothing to do so just get out
@@ -445,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;
@@ -472,15 +455,12 @@
if (kmodSet)
kmodSet->release();
- if (myname)
- myname->release();
-
if (sStalled) {
ACCUMSIZE(-(sStalled->capacity * sizeof(OSMetaClass *)
+ sizeof(*sStalled)));
- kfree(sStalled->classes,
+ kfree((vm_offset_t) sStalled->classes,
sStalled->capacity * sizeof(OSMetaClass *));
- kfree(sStalled, sizeof(*sStalled));
+ kfree((vm_offset_t) sStalled, sizeof(*sStalled));
sStalled = 0;
}
@@ -511,7 +491,7 @@
bool result = false;
if (!loadLock) {
- loadLock = mutex_alloc(0);
+ loadLock = mutex_alloc(ETAP_IO_AHA);
mutex_lock(loadLock);
}
else
@@ -570,34 +550,6 @@
iter->release();
}
-
-
-extern "C" {
-
-IOReturn OSMetaClassSystemSleepOrWake(UInt32 messageType)
-{
- mutex_lock(loadLock);
-
- /* If the system is going to sleep, cancel the reaper thread timer
- * and mark unloads disabled in case it just fired but hasn't
- * taken the lock yet. If we are coming back from sleep, just
- * set unloads enabled; IOService's normal operation will cause
- * unloads to be considered soon enough.
- */
- if (messageType == kIOMessageSystemWillSleep) {
- if (unloadCallout) {
- thread_call_cancel(unloadCallout);
- }
- unloadsEnabled = false;
- } else if (messageType == kIOMessageSystemHasPoweredOn) {
- unloadsEnabled = true;
- }
- mutex_unlock(loadLock);
-
- return kIOReturnSuccess;
-}
-
-};
extern "C" kern_return_t kmod_unload_cache(void);
@@ -615,11 +567,6 @@
mutex_lock(loadLock);
- if (!unloadsEnabled) {
- mutex_unlock(loadLock);
- return;
- }
-
do {
kmods = OSCollectionIterator::withCollection(sKModClassesDict);
@@ -630,7 +577,7 @@
while ( (kmodName = (OSSymbol *) kmods->getNextObject()) ) {
if (ki) {
- kfree(ki, sizeof(kmod_info_t));
+ kfree((vm_offset_t) ki, sizeof(kmod_info_t));
ki = 0;
}
@@ -672,6 +619,7 @@
void OSMetaClass::considerUnloads()
{
+ static thread_call_t unloadCallout;
AbsoluteTime when;
mutex_lock(loadLock);
@@ -821,11 +769,6 @@
const OSMetaClass *OSMetaClass::getSuperClass() const
{
return superClassLink;
-}
-
-const OSSymbol *OSMetaClass::getKmodName() const
-{
- return (const OSSymbol *)sSortedByClassesDict->getObject((OSSymbol *)this);
}
unsigned int OSMetaClass::getInstanceCount() const