Loading...
--- xnu/xnu-792.12.6/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-344.49/libkern/c++/OSMetaClass.cpp
@@ -1,35 +1,31 @@
/*
* 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
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ *
+ * 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. 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
+ *
+ * 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@
+ *
+ * @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>
@@ -48,8 +44,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>
@@ -76,7 +72,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 {
@@ -293,10 +289,8 @@
do {
OSCollectionIterator *iter;
- if (sAllClassesDict) {
+ if (sAllClassesDict)
sAllClassesDict->removeObject(className);
- className->release();
- }
iter = OSCollectionIterator::withCollection(sKModClassesDict);
if (!iter)
@@ -328,6 +322,7 @@
memmove(&sStalled->classes[i], &sStalled->classes[i+1],
(sStalled->count - i) * sizeof(OSMetaClass *));
}
+ return;
}
}
@@ -353,7 +348,7 @@
void *OSMetaClass::preModLoad(const char *kmodName)
{
if (!loadLock) {
- loadLock = mutex_alloc(0);
+ loadLock = mutex_alloc(ETAP_IO_AHA);
mutex_lock(loadLock);
}
else
@@ -389,7 +384,6 @@
{
OSReturn result = kOSReturnSuccess;
OSSet *kmodSet = 0;
- OSSymbol *myname = 0;
if (!sStalled || loadHandle != sStalled) {
logError(kOSMetaClassInternal);
@@ -406,8 +400,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;
}
@@ -416,7 +409,6 @@
case kCompletedBootstrap:
{
unsigned int i;
- myname = OSSymbol::withCStringNoCopy(sStalled->kmodName);
if (!sStalled->count)
break; // Nothing to do so just get out
@@ -440,20 +432,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;
@@ -466,9 +457,6 @@
if (kmodSet)
kmodSet->release();
-
- if (myname)
- myname->release();
if (sStalled) {
ACCUMSIZE(-(sStalled->capacity * sizeof(OSMetaClass *)
@@ -506,7 +494,7 @@
bool result = false;
if (!loadLock) {
- loadLock = mutex_alloc(0);
+ loadLock = mutex_alloc(ETAP_IO_AHA);
mutex_lock(loadLock);
}
else
@@ -565,8 +553,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)
@@ -592,7 +578,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;
}
@@ -628,8 +614,6 @@
} while (didUnload);
mutex_unlock(loadLock);
-
- kmod_unload_cache();
}
void OSMetaClass::considerUnloads()
@@ -786,11 +770,6 @@
return superClassLink;
}
-const OSSymbol *OSMetaClass::getKmodName() const
-{
- return sSortedByClassesDict->getObject((const OSSymbol *)this);
-}
-
unsigned int OSMetaClass::getInstanceCount() const
{
return instanceCount;
@@ -822,50 +801,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;
+}
+