Loading...
--- xnu/xnu-792.18.15/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-201/libkern/c++/OSDictionary.cpp
@@ -1,29 +1,23 @@
/*
* 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@
*/
/* OSDictionary.m created by rsulack on Fri 12-Sep-1997 */
/* OSDictionary.cpp converted to C++ by gvdl on Fri 1998-10-30 */
@@ -58,9 +52,6 @@
#define ACCUMSIZE(s)
#endif
-#define EXT_CAST(obj) \
- reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
-
bool OSDictionary::initWithCapacity(unsigned int inCapacity)
{
if (!super::init())
@@ -85,7 +76,7 @@
bool OSDictionary::initWithObjects(const OSObject *objects[],
const OSSymbol *keys[],
unsigned int theCount,
- unsigned int theCapacity)
+ unsigned int theCapacity = 0)
{
unsigned int capacity = theCount;
@@ -115,7 +106,7 @@
bool OSDictionary::initWithObjects(const OSObject *objects[],
const OSString *keys[],
unsigned int theCount,
- unsigned int theCapacity)
+ unsigned int theCapacity = 0)
{
unsigned int capacity = theCount;
@@ -151,7 +142,7 @@
}
bool OSDictionary::initWithDictionary(const OSDictionary *dict,
- unsigned int theCapacity)
+ unsigned int theCapacity = 0)
{
unsigned int capacity;
@@ -173,8 +164,8 @@
count = dict->count;
bcopy(dict->dictionary, dictionary, count * sizeof(dictEntry));
for (unsigned int i = 0; i < count; i++) {
- dictionary[i].key->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].value->taggedRetain(OSTypeID(OSCollection));
+ dictionary[i].key->retain();
+ dictionary[i].value->retain();
}
return true;
@@ -185,7 +176,7 @@
OSDictionary *me = new OSDictionary;
if (me && !me->initWithCapacity(capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -195,12 +186,12 @@
OSDictionary *OSDictionary::withObjects(const OSObject *objects[],
const OSSymbol *keys[],
unsigned int count,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSDictionary *me = new OSDictionary;
if (me && !me->initWithObjects(objects, keys, count, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -210,12 +201,12 @@
OSDictionary *OSDictionary::withObjects(const OSObject *objects[],
const OSString *keys[],
unsigned int count,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSDictionary *me = new OSDictionary;
if (me && !me->initWithObjects(objects, keys, count, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -223,12 +214,12 @@
}
OSDictionary *OSDictionary::withDictionary(const OSDictionary *dict,
- unsigned int capacity)
+ unsigned int capacity = 0)
{
OSDictionary *me = new OSDictionary;
if (me && !me->initWithDictionary(dict, capacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -237,10 +228,9 @@
void OSDictionary::free()
{
- (void) super::setOptions(0, kImmutable);
flushCollection();
if (dictionary) {
- kfree(dictionary, capacity * sizeof(dictEntry));
+ kfree((vm_offset_t)dictionary, capacity * sizeof(dictEntry));
ACCUMSIZE( -(capacity * sizeof(dictEntry)) );
}
@@ -283,7 +273,7 @@
bzero(&newDict[capacity], newSize - oldSize);
ACCUMSIZE(newSize - oldSize);
- kfree(dictionary, oldSize);
+ kfree((vm_offset_t)dictionary, oldSize);
dictionary = newDict;
capacity = newCapacity;
@@ -297,8 +287,8 @@
haveUpdated();
for (unsigned int i = 0; i < count; i++) {
- dictionary[i].key->taggedRelease(OSTypeID(OSCollection));
- dictionary[i].value->taggedRelease(OSTypeID(OSCollection));
+ dictionary[i].key->release();
+ dictionary[i].value->release();
}
count = 0;
}
@@ -314,12 +304,12 @@
if (aKey == dictionary[i].key) {
const OSMetaClassBase *oldObject = dictionary[i].value;
+ anObject->retain();
+ dictionary[i].value = anObject;
+
haveUpdated();
- anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].value = anObject;
-
- oldObject->taggedRelease(OSTypeID(OSCollection));
+ oldObject->release();
return true;
}
}
@@ -328,13 +318,13 @@
if (count >= capacity && count >= ensureCapacity(count+1))
return 0;
- haveUpdated();
-
- aKey->taggedRetain(OSTypeID(OSCollection));
- anObject->taggedRetain(OSTypeID(OSCollection));
+ aKey->retain();
+ anObject->retain();
dictionary[count].key = aKey;
dictionary[count].value = anObject;
count++;
+
+ haveUpdated();
return true;
}
@@ -355,30 +345,30 @@
for (; i < count; i++)
dictionary[i] = dictionary[i+1];
- oldEntry.key->taggedRelease(OSTypeID(OSCollection));
- oldEntry.value->taggedRelease(OSTypeID(OSCollection));
+ oldEntry.key->release();
+ oldEntry.value->release();
return;
}
}
// Returns true on success, false on an error condition.
-bool OSDictionary::merge(const OSDictionary *srcDict)
+bool OSDictionary::merge(const OSDictionary *aDictionary)
{
const OSSymbol * sym;
OSCollectionIterator * iter;
- if ( !OSDynamicCast(OSDictionary, srcDict) )
- return false;
-
- iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
+ if ( !OSDynamicCast(OSDictionary, (OSDictionary *) aDictionary) )
+ return false;
+
+ iter = OSCollectionIterator::withCollection((OSDictionary *)aDictionary);
if ( !iter )
return false;
while ( (sym = (const OSSymbol *)iter->getNextObject()) ) {
const OSMetaClassBase * obj;
- obj = srcDict->getObject(sym);
+ obj = aDictionary->getObject(sym);
if ( !setObject(sym, obj) ) {
iter->release();
return false;
@@ -445,7 +435,7 @@
OBJECT_WRAP_3(removeObject, OSSymbol::withCString(aKey))
bool
-OSDictionary::isEqualTo(const OSDictionary *srcDict, const OSCollection *keys) const
+OSDictionary::isEqualTo(const OSDictionary *aDictionary, const OSCollection *keys) const
{
OSCollectionIterator * iter;
unsigned int keysCount;
@@ -454,11 +444,11 @@
OSString * aKey;
bool ret;
- if ( this == srcDict )
+ if ( this == aDictionary )
return true;
keysCount = keys->getCount();
- if ( (count < keysCount) || (srcDict->getCount() < keysCount) )
+ if ( (count < keysCount) || (aDictionary->getCount() < keysCount) )
return false;
iter = OSCollectionIterator::withCollection(keys);
@@ -468,7 +458,7 @@
ret = true;
while ( (aKey = OSDynamicCast(OSString, iter->getNextObject())) ) {
obj1 = getObject(aKey);
- obj2 = srcDict->getObject(aKey);
+ obj2 = aDictionary->getObject(aKey);
if ( !obj1 || !obj2 ) {
ret = false;
break;
@@ -484,19 +474,19 @@
return ret;
}
-bool OSDictionary::isEqualTo(const OSDictionary *srcDict) const
+bool OSDictionary::isEqualTo(const OSDictionary *aDictionary) const
{
unsigned int i;
const OSMetaClassBase * obj;
- if ( this == srcDict )
+ if ( this == aDictionary )
return true;
- if ( count != srcDict->getCount() )
+ if ( count != aDictionary->getCount() )
return false;
for ( i = 0; i < count; i++ ) {
- obj = srcDict->getObject(dictionary[i].key);
+ obj = aDictionary->getObject(dictionary[i].key);
if ( !obj )
return false;
@@ -578,77 +568,3 @@
return s->addXMLEndTag("dict");
}
-
-unsigned OSDictionary::setOptions(unsigned options, unsigned mask, void *)
-{
- unsigned old = super::setOptions(options, mask);
- if ((old ^ options) & mask) {
-
- // Value changed need to recurse over all of the child collections
- for ( unsigned i = 0; i < count; i++ ) {
- OSCollection *v = OSDynamicCast(OSCollection, dictionary[i].value);
- if (v)
- v->setOptions(options, mask);
- }
- }
-
- return old;
-}
-
-OSCollection * OSDictionary::copyCollection(OSDictionary *cycleDict)
-{
- bool allocDict = !cycleDict;
- OSCollection *ret = 0;
- OSDictionary *newDict = 0;
-
- if (allocDict) {
- cycleDict = OSDictionary::withCapacity(16);
- if (!cycleDict)
- return 0;
- }
-
- do {
- // Check for a cycle
- ret = super::copyCollection(cycleDict);
- if (ret)
- continue;
-
- newDict = OSDictionary::withDictionary(this);
- if (!newDict)
- continue;
-
- // Insert object into cycle Dictionary
- cycleDict->setObject((const OSSymbol *) this, newDict);
-
- for (unsigned int i = 0; i < count; i++) {
- const OSMetaClassBase *obj = dictionary[i].value;
- OSCollection *coll = OSDynamicCast(OSCollection, EXT_CAST(obj));
-
- if (coll) {
- OSCollection *newColl = coll->copyCollection(cycleDict);
- if (!newColl)
- goto abortCopy;
-
- newDict->dictionary[i].value = newColl;
-
- coll->taggedRelease(OSTypeID(OSCollection));
- newColl->taggedRetain(OSTypeID(OSCollection));
- newColl->release();
- };
- }
-
- ret = newDict;
- newDict = 0;
-
- } while (false);
-
-abortCopy:
- if (newDict)
- newDict->release();
-
- if (allocDict)
- cycleDict->release();
-
- return ret;
-}
-