Loading...
--- xnu/xnu-2782.1.97/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-517/libkern/c++/OSDictionary.cpp
@@ -1,19 +1,16 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * 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. 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.
+ * 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
@@ -23,7 +20,7 @@
* 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,19 +55,12 @@
#define ACCUMSIZE(s)
#endif
-#define EXT_CAST(obj) \
- reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
-
bool OSDictionary::initWithCapacity(unsigned int inCapacity)
{
if (!super::init())
return false;
- if (inCapacity > (UINT_MAX / sizeof(dictEntry)))
- return false;
-
- unsigned int size = inCapacity * sizeof(dictEntry);
-//fOptions |= kSort;
+ int size = inCapacity * sizeof(dictEntry);
dictionary = (dictEntry *) kalloc(size);
if (!dictionary)
@@ -91,7 +81,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int newCapacity = theCount;
+ unsigned int capacity = theCount;
if (!objects || !keys)
return false;
@@ -100,10 +90,10 @@
if (theCount > theCapacity)
return false;
- newCapacity = theCapacity;
- }
-
- if (!initWithCapacity(newCapacity))
+ capacity = theCapacity;
+ }
+
+ if (!initWithCapacity(capacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -121,7 +111,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int newCapacity = theCount;
+ unsigned int capacity = theCount;
if (!objects || !keys)
return false;
@@ -130,10 +120,10 @@
if (theCount > theCapacity)
return false;
- newCapacity = theCapacity;
- }
-
- if (!initWithCapacity(newCapacity))
+ capacity = theCapacity;
+ }
+
+ if (!initWithCapacity(capacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -157,31 +147,22 @@
bool OSDictionary::initWithDictionary(const OSDictionary *dict,
unsigned int theCapacity)
{
- unsigned int newCapacity;
+ unsigned int capacity;
if ( !dict )
return false;
- newCapacity = dict->count;
+ capacity = dict->count;
if ( theCapacity ) {
if ( dict->count > theCapacity )
return false;
- newCapacity = theCapacity;
- }
-
- if (!initWithCapacity(newCapacity))
- return false;
-
- if ((kSort & fOptions) && !(kSort & dict->fOptions)) {
- for (unsigned int i = 0; i < dict->count; i++) {
- if (!setObject(dict->dictionary[i].key, dict->dictionary[i].value)) {
- return false;
- }
- }
- return true;
- }
+ capacity = theCapacity;
+ }
+
+ if (!initWithCapacity(capacity))
+ return false;
count = dict->count;
bcopy(dict->dictionary, dictionary, count * sizeof(dictEntry));
@@ -250,10 +231,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)) );
}
@@ -278,20 +258,15 @@
unsigned int OSDictionary::ensureCapacity(unsigned int newCapacity)
{
dictEntry *newDict;
- unsigned int finalCapacity, oldSize, newSize;
+ int oldSize, newSize;
if (newCapacity <= capacity)
return capacity;
// round up
- finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
* capacityIncrement;
-
- // integer overflow check
- if (finalCapacity < newCapacity || (finalCapacity > (UINT_MAX / sizeof(dictEntry))))
- return capacity;
-
- newSize = sizeof(dictEntry) * finalCapacity;
+ newSize = sizeof(dictEntry) * newCapacity;
newDict = (dictEntry *) kalloc(newSize);
if (newDict) {
@@ -301,10 +276,10 @@
bzero(&newDict[capacity], newSize - oldSize);
ACCUMSIZE(newSize - oldSize);
- kfree(dictionary, oldSize);
+ kfree((vm_offset_t)dictionary, oldSize);
dictionary = newDict;
- capacity = finalCapacity;
+ capacity = newCapacity;
}
return capacity;
@@ -324,79 +299,59 @@
bool OSDictionary::
setObject(const OSSymbol *aKey, const OSMetaClassBase *anObject)
{
- unsigned int i;
- bool exists;
-
if (!anObject || !aKey)
return false;
// if the key exists, replace the object
-
- if (fOptions & kSort) {
- i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
- exists = (i < count) && (aKey == dictionary[i].key);
- } else for (exists = false, i = 0; i < count; i++) {
- if ((exists = (aKey == dictionary[i].key))) break;
- }
-
- if (exists) {
- const OSMetaClassBase *oldObject = dictionary[i].value;
-
- haveUpdated();
-
- anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].value = anObject;
-
- oldObject->taggedRelease(OSTypeID(OSCollection));
- return true;
+ for (unsigned int i = 0; i < count; i++) {
+ if (aKey == dictionary[i].key) {
+ const OSMetaClassBase *oldObject = dictionary[i].value;
+
+ anObject->taggedRetain(OSTypeID(OSCollection));
+ dictionary[i].value = anObject;
+
+ haveUpdated();
+
+ oldObject->taggedRelease(OSTypeID(OSCollection));
+ return true;
+ }
}
// add new key, possibly extending our capacity
if (count >= capacity && count >= ensureCapacity(count+1))
- return false;
-
- haveUpdated();
-
- bcopy(&dictionary[i], &dictionary[i+1], (count - i) * sizeof(dictionary[0]));
+ return 0;
aKey->taggedRetain(OSTypeID(OSCollection));
anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].key = aKey;
- dictionary[i].value = anObject;
+ dictionary[count].key = aKey;
+ dictionary[count].value = anObject;
count++;
+ haveUpdated();
+
return true;
}
void OSDictionary::removeObject(const OSSymbol *aKey)
{
- unsigned int i;
- bool exists;
-
if (!aKey)
return;
// if the key exists, remove the object
-
- if (fOptions & kSort) {
- i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
- exists = (i < count) && (aKey == dictionary[i].key);
- } else for (exists = false, i = 0; i < count; i++) {
- if ((exists = (aKey == dictionary[i].key))) break;
- }
-
- if (exists) {
- dictEntry oldEntry = dictionary[i];
-
- haveUpdated();
-
- count--;
- bcopy(&dictionary[i+1], &dictionary[i], (count - i) * sizeof(dictionary[0]));
-
- oldEntry.key->taggedRelease(OSTypeID(OSCollection));
- oldEntry.value->taggedRelease(OSTypeID(OSCollection));
- return;
- }
+ for (unsigned int i = 0; i < count; i++)
+ if (aKey == dictionary[i].key) {
+ dictEntry oldEntry = dictionary[i];
+
+ haveUpdated();
+
+ count--;
+ for (; i < count; i++)
+ dictionary[i] = dictionary[i+1];
+
+ oldEntry.key->taggedRelease(OSTypeID(OSCollection));
+ oldEntry.value->taggedRelease(OSTypeID(OSCollection));
+ return;
+ }
}
@@ -409,7 +364,7 @@
if ( !OSDynamicCast(OSDictionary, srcDict) )
return false;
- iter = OSCollectionIterator::withCollection(const_cast<OSDictionary *>(srcDict));
+ iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
if ( !iter )
return false;
@@ -429,24 +384,13 @@
OSObject *OSDictionary::getObject(const OSSymbol *aKey) const
{
- unsigned int i;
- bool exists;
-
if (!aKey)
return 0;
- // if the key exists, return the object
-
- if (fOptions & kSort) {
- i = OSSymbol::bsearch(aKey, &dictionary[0], count, sizeof(dictionary[0]));
- exists = (i < count) && (aKey == dictionary[i].key);
- } else for (exists = false, i = 0; i < count; i++) {
- if ((exists = (aKey == dictionary[i].key))) break;
- }
-
- if (exists) {
- return (const_cast<OSObject *> ((const OSObject *)dictionary[i].value));
- }
+ // if the key exists, remove the object
+ for (unsigned int i = 0; i < count; i++)
+ if (aKey == dictionary[i].key)
+ return (OSObject *) dictionary[i].value;
return 0;
}
@@ -627,77 +571,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;
-}
-