Loading...
--- xnu/xnu-1228/libkern/c++/OSDictionary.cpp
+++ xnu/xnu-4903.231.4/libkern/c++/OSDictionary.cpp
@@ -49,15 +49,6 @@
OSMetaClassDefineReservedUnused(OSDictionary, 6);
OSMetaClassDefineReservedUnused(OSDictionary, 7);
-#if OSALLOCDEBUG
-extern "C" {
- extern int debug_container_malloc_size;
-};
-#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
-#else
-#define ACCUMSIZE(s)
-#endif
-
#define EXT_CAST(obj) \
reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
@@ -66,14 +57,18 @@
if (!super::init())
return false;
- int size = inCapacity * sizeof(dictEntry);
-
- dictionary = (dictEntry *) kalloc(size);
+ if (inCapacity > (UINT_MAX / sizeof(dictEntry)))
+ return false;
+
+ unsigned int size = inCapacity * sizeof(dictEntry);
+//fOptions |= kSort;
+
+ dictionary = (dictEntry *) kalloc_container(size);
if (!dictionary)
return false;
bzero(dictionary, size);
- ACCUMSIZE(size);
+ OSCONTAINER_ACCUMSIZE(size);
count = 0;
capacity = inCapacity;
@@ -87,7 +82,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int capacity = theCount;
+ unsigned int newCapacity = theCount;
if (!objects || !keys)
return false;
@@ -96,10 +91,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++) {
@@ -117,7 +112,7 @@
unsigned int theCount,
unsigned int theCapacity)
{
- unsigned int capacity = theCount;
+ unsigned int newCapacity = theCount;
if (!objects || !keys)
return false;
@@ -126,10 +121,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++) {
@@ -153,22 +148,31 @@
bool OSDictionary::initWithDictionary(const OSDictionary *dict,
unsigned int theCapacity)
{
- unsigned int capacity;
+ 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))
- 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;
+ }
count = dict->count;
bcopy(dict->dictionary, dictionary, count * sizeof(dictEntry));
@@ -241,7 +245,7 @@
flushCollection();
if (dictionary) {
kfree(dictionary, capacity * sizeof(dictEntry));
- ACCUMSIZE( -(capacity * sizeof(dictEntry)) );
+ OSCONTAINER_ACCUMSIZE( -(capacity * sizeof(dictEntry)) );
}
super::free();
@@ -265,28 +269,37 @@
unsigned int OSDictionary::ensureCapacity(unsigned int newCapacity)
{
dictEntry *newDict;
- int oldSize, newSize;
+ unsigned int finalCapacity;
+ vm_size_t oldSize, newSize;
if (newCapacity <= capacity)
return capacity;
// round up
- newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
* capacityIncrement;
- newSize = sizeof(dictEntry) * newCapacity;
-
- newDict = (dictEntry *) kalloc(newSize);
+
+ // integer overflow check
+ if (finalCapacity < newCapacity || (finalCapacity > (UINT_MAX / sizeof(dictEntry))))
+ return capacity;
+
+ newSize = sizeof(dictEntry) * finalCapacity;
+
+ newDict = (dictEntry *) kallocp_container(&newSize);
if (newDict) {
+ // use all of the actual allocation size
+ finalCapacity = newSize / sizeof(dictEntry);
+
oldSize = sizeof(dictEntry) * capacity;
bcopy(dictionary, newDict, oldSize);
bzero(&newDict[capacity], newSize - oldSize);
- ACCUMSIZE(newSize - oldSize);
+ OSCONTAINER_ACCUMSIZE(((size_t)newSize) - ((size_t)oldSize));
kfree(dictionary, oldSize);
dictionary = newDict;
- capacity = newCapacity;
+ capacity = finalCapacity;
}
return capacity;
@@ -304,61 +317,90 @@
}
bool OSDictionary::
-setObject(const OSSymbol *aKey, const OSMetaClassBase *anObject)
-{
+setObject(const OSSymbol *aKey, const OSMetaClassBase *anObject, bool onlyAdd)
+{
+ unsigned int i;
+ bool exists;
+
if (!anObject || !aKey)
return false;
// if the key exists, replace the object
- for (unsigned int i = 0; i < count; i++) {
- if (aKey == dictionary[i].key) {
- const OSMetaClassBase *oldObject = dictionary[i].value;
-
- haveUpdated();
-
- anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[i].value = anObject;
-
- oldObject->taggedRelease(OSTypeID(OSCollection));
- return true;
- }
+
+ 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) {
+
+ if (onlyAdd) return false;
+
+ const OSMetaClassBase *oldObject = dictionary[i].value;
+
+ haveUpdated();
+
+ anObject->taggedRetain(OSTypeID(OSCollection));
+ dictionary[i].value = anObject;
+
+ oldObject->taggedRelease(OSTypeID(OSCollection));
+ return true;
}
// add new key, possibly extending our capacity
if (count >= capacity && count >= ensureCapacity(count+1))
- return 0;
+ return false;
haveUpdated();
+
+ bcopy(&dictionary[i], &dictionary[i+1], (count - i) * sizeof(dictionary[0]));
aKey->taggedRetain(OSTypeID(OSCollection));
anObject->taggedRetain(OSTypeID(OSCollection));
- dictionary[count].key = aKey;
- dictionary[count].value = anObject;
+ dictionary[i].key = aKey;
+ dictionary[i].value = anObject;
count++;
return true;
}
+bool OSDictionary::
+setObject(const OSSymbol *aKey, const OSMetaClassBase *anObject)
+{
+ return (setObject(aKey, anObject, false));
+}
+
void OSDictionary::removeObject(const OSSymbol *aKey)
{
+ unsigned int i;
+ bool exists;
+
if (!aKey)
return;
// if the key exists, remove the object
- 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;
- }
+
+ 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;
+ }
}
@@ -371,7 +413,7 @@
if ( !OSDynamicCast(OSDictionary, srcDict) )
return false;
- iter = OSCollectionIterator::withCollection((OSDictionary *)srcDict);
+ iter = OSCollectionIterator::withCollection(const_cast<OSDictionary *>(srcDict));
if ( !iter )
return false;
@@ -391,13 +433,24 @@
OSObject *OSDictionary::getObject(const OSSymbol *aKey) const
{
+ unsigned int i;
+ bool exists;
+
if (!aKey)
return 0;
- // 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;
+ // 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));
+ }
return 0;
}
@@ -652,3 +705,49 @@
return ret;
}
+OSArray * OSDictionary::copyKeys(void)
+{
+ OSArray * array;
+
+ array = OSArray::withCapacity(count);
+ if (!array) return (0);
+
+ for (unsigned int i = 0; i < count; i++)
+ {
+ if (!array->setObject(i, dictionary[i].key))
+ {
+ array->release();
+ array = 0;
+ break;
+ }
+ }
+ return (array);
+}
+
+bool OSDictionary::iterateObjects(void * refcon, bool (*callback)(void * refcon, const OSSymbol * key, OSObject * object))
+{
+ unsigned int initialUpdateStamp;
+ bool done;
+
+ initialUpdateStamp = updateStamp;
+ done = false;
+ for (unsigned int i = 0; i < count; i++)
+ {
+ done = callback(refcon, dictionary[i].key, EXT_CAST(dictionary[i].value));
+ if (done) break;
+ if (initialUpdateStamp != updateStamp) break;
+ }
+
+ return initialUpdateStamp == updateStamp;
+}
+
+static bool OSDictionaryIterateObjectsBlock(void * refcon, const OSSymbol * key, OSObject * object)
+{
+ bool (^block)(const OSSymbol * key, OSObject * object) = (typeof(block)) refcon;
+ return (block(key, object));
+}
+
+bool OSDictionary::iterateObjects(bool (^block)(const OSSymbol * key, OSObject * object))
+{
+ return (iterateObjects((void *)block, &OSDictionaryIterateObjectsBlock));
+}