Loading...
--- xnu/xnu-344.49/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-1504.3.12/libkern/c++/OSDictionary.cpp
@@ -1,16 +1,19 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * @APPLE_OSREFERENCE_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. 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. 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
@@ -20,7 +23,7 @@
* Please see the License for the specific language governing rights and
* limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_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 */
@@ -55,6 +58,9 @@
#define ACCUMSIZE(s)
#endif
+#define EXT_CAST(obj) \
+ reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
+
bool OSDictionary::initWithCapacity(unsigned int inCapacity)
{
if (!super::init())
@@ -79,9 +85,9 @@
bool OSDictionary::initWithObjects(const OSObject *objects[],
const OSSymbol *keys[],
unsigned int theCount,
- unsigned int theCapacity = 0)
-{
- unsigned int capacity = theCount;
+ unsigned int theCapacity)
+{
+ unsigned int newCapacity = theCount;
if (!objects || !keys)
return false;
@@ -90,10 +96,10 @@
if (theCount > theCapacity)
return false;
- capacity = theCapacity;
- }
-
- if (!initWithCapacity(capacity))
+ newCapacity = theCapacity;
+ }
+
+ if (!initWithCapacity(newCapacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -109,9 +115,9 @@
bool OSDictionary::initWithObjects(const OSObject *objects[],
const OSString *keys[],
unsigned int theCount,
- unsigned int theCapacity = 0)
-{
- unsigned int capacity = theCount;
+ unsigned int theCapacity)
+{
+ unsigned int newCapacity = theCount;
if (!objects || !keys)
return false;
@@ -120,10 +126,10 @@
if (theCount > theCapacity)
return false;
- capacity = theCapacity;
- }
-
- if (!initWithCapacity(capacity))
+ newCapacity = theCapacity;
+ }
+
+ if (!initWithCapacity(newCapacity))
return false;
for (unsigned int i = 0; i < theCount; i++) {
@@ -145,23 +151,23 @@
}
bool OSDictionary::initWithDictionary(const OSDictionary *dict,
- unsigned int theCapacity = 0)
-{
- unsigned int capacity;
+ unsigned int theCapacity)
+{
+ unsigned int newCapacity;
if ( !dict )
return false;
- capacity = dict->count;
+ newCapacity = dict->count;
if ( theCapacity ) {
if ( dict->count > theCapacity )
return false;
- capacity = theCapacity;
- }
-
- if (!initWithCapacity(capacity))
+ newCapacity = theCapacity;
+ }
+
+ if (!initWithCapacity(newCapacity))
return false;
count = dict->count;
@@ -179,7 +185,7 @@
OSDictionary *me = new OSDictionary;
if (me && !me->initWithCapacity(capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -189,12 +195,12 @@
OSDictionary *OSDictionary::withObjects(const OSObject *objects[],
const OSSymbol *keys[],
unsigned int count,
- unsigned int capacity = 0)
+ unsigned int capacity)
{
OSDictionary *me = new OSDictionary;
if (me && !me->initWithObjects(objects, keys, count, capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -204,12 +210,12 @@
OSDictionary *OSDictionary::withObjects(const OSObject *objects[],
const OSString *keys[],
unsigned int count,
- unsigned int capacity = 0)
+ unsigned int capacity)
{
OSDictionary *me = new OSDictionary;
if (me && !me->initWithObjects(objects, keys, count, capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -217,12 +223,12 @@
}
OSDictionary *OSDictionary::withDictionary(const OSDictionary *dict,
- unsigned int capacity = 0)
+ unsigned int capacity)
{
OSDictionary *me = new OSDictionary;
if (me && !me->initWithDictionary(dict, capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -231,9 +237,10 @@
void OSDictionary::free()
{
+ (void) super::setOptions(0, kImmutable);
flushCollection();
if (dictionary) {
- kfree((vm_offset_t)dictionary, capacity * sizeof(dictEntry));
+ kfree(dictionary, capacity * sizeof(dictEntry));
ACCUMSIZE( -(capacity * sizeof(dictEntry)) );
}
@@ -276,7 +283,7 @@
bzero(&newDict[capacity], newSize - oldSize);
ACCUMSIZE(newSize - oldSize);
- kfree((vm_offset_t)dictionary, oldSize);
+ kfree(dictionary, oldSize);
dictionary = newDict;
capacity = newCapacity;
@@ -307,10 +314,10 @@
if (aKey == dictionary[i].key) {
const OSMetaClassBase *oldObject = dictionary[i].value;
+ haveUpdated();
+
anObject->taggedRetain(OSTypeID(OSCollection));
dictionary[i].value = anObject;
-
- haveUpdated();
oldObject->taggedRelease(OSTypeID(OSCollection));
return true;
@@ -320,6 +327,8 @@
// add new key, possibly extending our capacity
if (count >= capacity && count >= ensureCapacity(count+1))
return 0;
+
+ haveUpdated();
aKey->taggedRetain(OSTypeID(OSCollection));
anObject->taggedRetain(OSTypeID(OSCollection));
@@ -327,8 +336,6 @@
dictionary[count].value = anObject;
count++;
- haveUpdated();
-
return true;
}
@@ -364,7 +371,7 @@
if ( !OSDynamicCast(OSDictionary, srcDict) )
return false;
- iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
+ iter = OSCollectionIterator::withCollection(const_cast<OSDictionary *>(srcDict));
if ( !iter )
return false;
@@ -390,7 +397,7 @@
// 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 (const_cast<OSObject *> ((const OSObject *)dictionary[i].value));
return 0;
}
@@ -571,3 +578,77 @@
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;
+}
+