Loading...
--- xnu/xnu-1228.3.13/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-792.1.5/libkern/c++/OSMetaClass.cpp
@@ -1,29 +1,23 @@
/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_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.
+ * 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.
*
- * 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
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/* OSMetaClass.cpp created by gvdl on Fri 1998-11-17 */
@@ -44,9 +38,6 @@
#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>
@@ -79,7 +70,7 @@
static const int kKModCapacityIncrement = 10;
static OSDictionary *sAllClassesDict, *sKModClassesDict, *sSortedByClassesDict;
-static mutex_t *loadLock = 0;
+static mutex_t *loadLock;
static struct StalledData {
const char *kmodName;
OSReturn result;
@@ -89,8 +80,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";
@@ -283,7 +272,7 @@
sStalled->capacity += kKModCapacityIncrement;
memmove(sStalled->classes, oldStalled, oldSize);
- kfree(oldStalled, oldSize);
+ kfree((vm_offset_t)oldStalled, oldSize);
ACCUMSIZE(newSize - oldSize);
}
@@ -334,13 +323,13 @@
}
}
-void *OSMetaClass::operator new(__unused size_t size) { return 0; }
+void *OSMetaClass::operator new(size_t size) { return 0; }
void OSMetaClass::retain() const { }
void OSMetaClass::release() const { }
-void OSMetaClass::release(__unused int when) const { }
-void OSMetaClass::taggedRetain(__unused const void *tag) const { }
-void OSMetaClass::taggedRelease(__unused const void *tag) const { }
-void OSMetaClass::taggedRelease(__unused const void *tag, __unused const 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
@@ -367,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));
@@ -419,7 +408,7 @@
case kCompletedBootstrap:
{
unsigned int i;
- myname = (OSSymbol *)OSSymbol::withCStringNoCopy(sStalled->kmodName);
+ myname = OSSymbol::withCStringNoCopy(sStalled->kmodName);
if (!sStalled->count)
break; // Nothing to do so just get out
@@ -476,9 +465,9 @@
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;
}
@@ -569,38 +558,10 @@
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);
-static void _OSMetaClassConsiderUnloads(__unused thread_call_param_t p0,
- __unused thread_call_param_t p1)
+static void _OSMetaClassConsiderUnloads(thread_call_param_t p0,
+ thread_call_param_t p1)
{
OSSet *kmodClasses;
OSSymbol *kmodName;
@@ -613,11 +574,6 @@
mutex_lock(loadLock);
- if (!unloadsEnabled) {
- mutex_unlock(loadLock);
- return;
- }
-
do {
kmods = OSCollectionIterator::withCollection(sKModClassesDict);
@@ -628,7 +584,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;
}
@@ -670,6 +626,7 @@
void OSMetaClass::considerUnloads()
{
+ static thread_call_t unloadCallout;
AbsoluteTime when;
mutex_lock(loadLock);
@@ -823,7 +780,7 @@
const OSSymbol *OSMetaClass::getKmodName() const
{
- return (const OSSymbol *)sSortedByClassesDict->getObject((OSSymbol *)this);
+ return sSortedByClassesDict->getObject((const OSSymbol *)this);
}
unsigned int OSMetaClass::getInstanceCount() const
@@ -861,7 +818,7 @@
return 0;
}
-bool OSMetaClass::serialize(__unused OSSerialize *s) const
+bool OSMetaClass::serialize(OSSerialize *s) const
{
panic("OSMetaClass::serialize(): Obsoleted\n");
return false;