Loading...
--- xnu/xnu-201.19.3/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-792.6.76/libkern/c++/OSDictionary.cpp
@@ -52,6 +52,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())
@@ -76,7 +79,7 @@
bool OSDictionary::initWithObjects(const OSObject *objects[],
const OSSymbol *keys[],
unsigned int theCount,
- unsigned int theCapacity = 0)
+ unsigned int theCapacity)
{
unsigned int capacity = theCount;
@@ -106,7 +109,7 @@
bool OSDictionary::initWithObjects(const OSObject *objects[],
const OSString *keys[],
unsigned int theCount,
- unsigned int theCapacity = 0)
+ unsigned int theCapacity)
{
unsigned int capacity = theCount;
@@ -142,7 +145,7 @@
}
bool OSDictionary::initWithDictionary(const OSDictionary *dict,
- unsigned int theCapacity = 0)
+ unsigned int theCapacity)
{
unsigned int capacity;
@@ -164,8 +167,8 @@
count = dict->count;
bcopy(dict->dictionary, dictionary, count * sizeof(dictEntry));
for (unsigned int i = 0; i < count; i++) {
- dictionary[i].key->retain();
- dictionary[i].value->retain();
+ dictionary[i].key->taggedRetain(OSTypeID(OSCollection));
+ dictionary[i].value->taggedRetain(OSTypeID(OSCollection));
}
return true;
@@ -176,7 +179,7 @@
OSDictionary *me = new OSDictionary;
if (me && !me->initWithCapacity(capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -186,12 +189,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;
}
@@ -201,12 +204,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;
}
@@ -214,12 +217,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;
}
@@ -228,6 +231,7 @@
void OSDictionary::free()
{
+ (void) super::setOptions(0, kImmutable);
flushCollection();
if (dictionary) {
kfree((vm_offset_t)dictionary, capacity * sizeof(dictEntry));
@@ -287,8 +291,8 @@
haveUpdated();
for (unsigned int i = 0; i < count; i++) {
- dictionary[i].key->release();
- dictionary[i].value->release();
+ dictionary[i].key->taggedRelease(OSTypeID(OSCollection));
+ dictionary[i].value->taggedRelease(OSTypeID(OSCollection));
}
count = 0;
}
@@ -304,12 +308,12 @@
if (aKey == dictionary[i].key) {
const OSMetaClassBase *oldObject = dictionary[i].value;
- anObject->retain();
+ haveUpdated();
+
+ anObject->taggedRetain(OSTypeID(OSCollection));
dictionary[i].value = anObject;
- haveUpdated();
-
- oldObject->release();
+ oldObject->taggedRelease(OSTypeID(OSCollection));
return true;
}
}
@@ -318,13 +322,13 @@
if (count >= capacity && count >= ensureCapacity(count+1))
return 0;
- aKey->retain();
- anObject->retain();
+ haveUpdated();
+
+ aKey->taggedRetain(OSTypeID(OSCollection));
+ anObject->taggedRetain(OSTypeID(OSCollection));
dictionary[count].key = aKey;
dictionary[count].value = anObject;
count++;
-
- haveUpdated();
return true;
}
@@ -345,30 +349,30 @@
for (; i < count; i++)
dictionary[i] = dictionary[i+1];
- oldEntry.key->release();
- oldEntry.value->release();
+ oldEntry.key->taggedRelease(OSTypeID(OSCollection));
+ oldEntry.value->taggedRelease(OSTypeID(OSCollection));
return;
}
}
// Returns true on success, false on an error condition.
-bool OSDictionary::merge(const OSDictionary *aDictionary)
+bool OSDictionary::merge(const OSDictionary *srcDict)
{
const OSSymbol * sym;
OSCollectionIterator * iter;
- if ( !OSDynamicCast(OSDictionary, (OSDictionary *) aDictionary) )
- return false;
-
- iter = OSCollectionIterator::withCollection((OSDictionary *)aDictionary);
+ if ( !OSDynamicCast(OSDictionary, srcDict) )
+ return false;
+
+ iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
if ( !iter )
return false;
while ( (sym = (const OSSymbol *)iter->getNextObject()) ) {
const OSMetaClassBase * obj;
- obj = aDictionary->getObject(sym);
+ obj = srcDict->getObject(sym);
if ( !setObject(sym, obj) ) {
iter->release();
return false;
@@ -435,7 +439,7 @@
OBJECT_WRAP_3(removeObject, OSSymbol::withCString(aKey))
bool
-OSDictionary::isEqualTo(const OSDictionary *aDictionary, const OSCollection *keys) const
+OSDictionary::isEqualTo(const OSDictionary *srcDict, const OSCollection *keys) const
{
OSCollectionIterator * iter;
unsigned int keysCount;
@@ -444,11 +448,11 @@
OSString * aKey;
bool ret;
- if ( this == aDictionary )
+ if ( this == srcDict )
return true;
keysCount = keys->getCount();
- if ( (count < keysCount) || (aDictionary->getCount() < keysCount) )
+ if ( (count < keysCount) || (srcDict->getCount() < keysCount) )
return false;
iter = OSCollectionIterator::withCollection(keys);
@@ -458,7 +462,7 @@
ret = true;
while ( (aKey = OSDynamicCast(OSString, iter->getNextObject())) ) {
obj1 = getObject(aKey);
- obj2 = aDictionary->getObject(aKey);
+ obj2 = srcDict->getObject(aKey);
if ( !obj1 || !obj2 ) {
ret = false;
break;
@@ -474,19 +478,19 @@
return ret;
}
-bool OSDictionary::isEqualTo(const OSDictionary *aDictionary) const
+bool OSDictionary::isEqualTo(const OSDictionary *srcDict) const
{
unsigned int i;
const OSMetaClassBase * obj;
- if ( this == aDictionary )
+ if ( this == srcDict )
return true;
- if ( count != aDictionary->getCount() )
+ if ( count != srcDict->getCount() )
return false;
for ( i = 0; i < count; i++ ) {
- obj = aDictionary->getObject(dictionary[i].key);
+ obj = srcDict->getObject(dictionary[i].key);
if ( !obj )
return false;
@@ -568,3 +572,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;
+}
+