Loading...
--- xnu/xnu-344.49/libkern/c++/OSSet.cpp
+++ xnu/xnu-2050.9.2/libkern/c++/OSSet.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,13 +23,14 @@
* Please see the License for the specific language governing rights and
* limitations under the License.
*
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/* IOSet.m created by rsulack on Thu 11-Jun-1998 */
-#include <libkern/c++/OSSet.h>
+#include <libkern/c++/OSDictionary.h>
#include <libkern/c++/OSArray.h>
#include <libkern/c++/OSSerialize.h>
+#include <libkern/c++/OSSet.h>
#define super OSCollection
@@ -40,6 +44,9 @@
OSMetaClassDefineReservedUnused(OSSet, 6);
OSMetaClassDefineReservedUnused(OSSet, 7);
+#define EXT_CAST(obj) \
+ reinterpret_cast<OSObject *>(const_cast<OSMetaClassBase *>(obj))
+
bool OSSet::initWithCapacity(unsigned int inCapacity)
{
if ( !super::init() )
@@ -54,7 +61,7 @@
bool OSSet::initWithObjects(const OSObject *inObjects[],
unsigned int inCount,
- unsigned int inCapacity = 0)
+ unsigned int inCapacity)
{
unsigned int capacity = inCount;
@@ -69,6 +76,7 @@
return false;
for ( unsigned int i = 0; i < inCount; i++ ) {
+// xx-review: no test here for failure of setObject()
if (members->getCount() < inCapacity)
setObject(inObjects[i]);
else
@@ -79,7 +87,7 @@
}
bool OSSet::initWithArray(const OSArray *inArray,
- unsigned int inCapacity = 0)
+ unsigned int inCapacity)
{
if ( !inArray )
return false;
@@ -89,7 +97,7 @@
}
bool OSSet::initWithSet(const OSSet *inSet,
- unsigned int inCapacity = 0)
+ unsigned int inCapacity)
{
return initWithArray(inSet->members, inCapacity);
}
@@ -99,7 +107,7 @@
OSSet *me = new OSSet;
if (me && !me->initWithCapacity(capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -108,12 +116,12 @@
OSSet *OSSet::withObjects(const OSObject *objects[],
unsigned int count,
- unsigned int capacity = 0)
+ unsigned int capacity)
{
OSSet *me = new OSSet;
if (me && !me->initWithObjects(objects, count, capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -121,12 +129,12 @@
}
OSSet *OSSet::withArray(const OSArray *array,
- unsigned int capacity = 0)
+ unsigned int capacity)
{
OSSet *me = new OSSet;
if (me && !me->initWithArray(array, capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -134,12 +142,12 @@
}
OSSet *OSSet::withSet(const OSSet *set,
- unsigned int capacity = 0)
+ unsigned int capacity)
{
OSSet *me = new OSSet;
if (me && !me->initWithSet(set, capacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -148,6 +156,7 @@
void OSSet::free()
{
+ (void) members->super::setOptions(0, kImmutable);
if (members)
members->release();
@@ -187,29 +196,38 @@
bool OSSet::setObject(const OSMetaClassBase *anObject)
{
- if (containsObject(anObject))
- return false;
- else {
+ if (containsObject(anObject)) {
+ return false;
+ } else {
haveUpdated();
return members->setObject(anObject);
}
}
-bool OSSet::merge(const OSArray *array)
-{
- const OSMetaClassBase *anObject;
- bool retVal = false;
-
- for (int i = 0; (anObject = array->getObject(i)); i++)
- if (setObject(anObject))
- retVal = true;
-
- return retVal;
-}
-
-bool OSSet::merge(const OSSet *set)
-{
- return setObject(set->members);
+bool OSSet::merge(const OSArray * array)
+{
+ const OSMetaClassBase * anObject = 0;
+ bool result = true;
+
+ for (int i = 0; (anObject = array->getObject(i)); i++) {
+
+ /* setObject() returns false if the object is already in the set,
+ * so we have to check beforehand here with containsObject().
+ */
+ if (containsObject(anObject)) {
+ continue;
+ }
+ if (!setObject(anObject)) {
+ result = false;
+ }
+ }
+
+ return result;
+}
+
+bool OSSet::merge(const OSSet * set)
+{
+ return merge(set->members);
}
void OSSet::removeObject(const OSMetaClassBase *anObject)
@@ -262,6 +280,8 @@
for ( i = 0; i < count; i++ ) {
obj1 = aSet->members->getObject(i);
+ if (containsObject(obj1))
+ continue;
obj2 = members->getObject(i);
if ( !obj1 || !obj2 )
return false;
@@ -324,3 +344,71 @@
return s->addXMLEndTag("set");
}
+
+unsigned OSSet::setOptions(unsigned options, unsigned mask, void *)
+{
+ unsigned old = super::setOptions(options, mask);
+ if ((old ^ options) & mask)
+ members->setOptions(options, mask);
+
+ return old;
+}
+
+OSCollection * OSSet::copyCollection(OSDictionary *cycleDict)
+{
+ bool allocDict = !cycleDict;
+ OSCollection *ret = 0;
+ OSSet *newSet = 0;
+
+ if (allocDict) {
+ cycleDict = OSDictionary::withCapacity(16);
+ if (!cycleDict)
+ return 0;
+ }
+
+ do {
+ // Check for a cycle
+ ret = super::copyCollection(cycleDict);
+ if (ret)
+ continue; // Found it
+
+ newSet = OSSet::withCapacity(members->capacity);
+ if (!newSet)
+ continue; // Couldn't create new set abort
+
+ // Insert object into cycle Dictionary
+ cycleDict->setObject((const OSSymbol *) this, newSet);
+
+ OSArray *newMembers = newSet->members;
+ newMembers->capacityIncrement = members->capacityIncrement;
+
+ // Now copy over the contents into the new duplicate
+ for (unsigned int i = 0; i < members->count; i++) {
+ OSObject *obj = EXT_CAST(members->array[i]);
+ OSCollection *coll = OSDynamicCast(OSCollection, obj);
+ if (coll) {
+ OSCollection *newColl = coll->copyCollection(cycleDict);
+ if (newColl) {
+ obj = newColl; // Rely on cycleDict ref for a bit
+ newColl->release();
+ }
+ else
+ goto abortCopy;
+ };
+ newMembers->setObject(obj);
+ };
+
+ ret = newSet;
+ newSet = 0;
+
+ } while(false);
+
+abortCopy:
+ if (newSet)
+ newSet->release();
+
+ if (allocDict)
+ cycleDict->release();
+
+ return ret;
+}