Loading...
--- xnu/xnu-3248.50.21/libkern/c++/OSData.cpp
+++ xnu/xnu-517.9.5/libkern/c++/OSData.cpp
@@ -1,29 +1,23 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_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. 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.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * 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
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
*/
/* IOData.m created by rsulack on Thu 25-Sep-1997 */
@@ -38,7 +32,7 @@
#define super OSObject
OSDefineMetaClassAndStructors(OSData, OSObject)
-OSMetaClassDefineReservedUsed(OSData, 0); // setDeallocFunction
+OSMetaClassDefineReservedUnused(OSData, 0);
OSMetaClassDefineReservedUnused(OSData, 1);
OSMetaClassDefineReservedUnused(OSData, 2);
OSMetaClassDefineReservedUnused(OSData, 3);
@@ -49,30 +43,32 @@
#define EXTERNAL ((unsigned int) -1)
+#if OSALLOCDEBUG
+extern int debug_container_malloc_size;
+#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
+#else
+#define ACCUMSIZE(s)
+#endif
+
bool OSData::initWithCapacity(unsigned int inCapacity)
{
- if (data)
- {
- OSCONTAINER_ACCUMSIZE(-((size_t)capacity));
- if (!inCapacity || (capacity < inCapacity))
- {
- // clean out old data's storage if it isn't big enough
- kfree(data, capacity);
- data = 0;
- capacity = 0;
- }
- }
-
if (!super::init())
return false;
+ if (data && (!inCapacity || capacity < inCapacity) ) {
+ // clean out old data's storage if it isn't big enough
+ kfree((vm_address_t) data, capacity);
+ data = 0;
+ ACCUMSIZE(-capacity);
+ }
+
if (inCapacity && !data) {
- data = (void *) kalloc_container(inCapacity);
+ data = (void *) kalloc(inCapacity);
if (!data)
return false;
capacity = inCapacity;
- }
- OSCONTAINER_ACCUMSIZE(capacity);
+ ACCUMSIZE(inCapacity);
+ }
length = 0;
if (inCapacity < 16)
@@ -186,15 +182,9 @@
void OSData::free()
{
if (capacity != EXTERNAL && data && capacity) {
- kfree(data, capacity);
- OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
- } else if (capacity == EXTERNAL) {
- DeallocFunction freemem = reserved ? reserved->deallocFunction : NULL;
- if (freemem && data && length) {
- freemem(data, length);
- }
- }
- if (reserved) kfree(reserved, sizeof(ExpansionData));
+ kfree((vm_offset_t)data, capacity);
+ ACCUMSIZE( -capacity );
+ }
super::free();
}
@@ -211,34 +201,27 @@
return capacityIncrement = increment;
}
-// xx-review: does not check for capacity == EXTERNAL
-
unsigned int OSData::ensureCapacity(unsigned int newCapacity)
{
unsigned char * newData;
- unsigned int finalCapacity;
if (newCapacity <= capacity)
return capacity;
- finalCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
* capacityIncrement;
- // integer overflow check
- if (finalCapacity < newCapacity)
- return capacity;
-
- newData = (unsigned char *) kalloc_container(finalCapacity);
-
+ newData = (unsigned char *) kalloc(newCapacity);
+
if ( newData ) {
- bzero(newData + capacity, finalCapacity - capacity);
+ bzero(newData + capacity, newCapacity - capacity);
if (data) {
bcopy(data, newData, capacity);
- kfree(data, capacity);
+ kfree((vm_offset_t)data, capacity);
}
- OSCONTAINER_ACCUMSIZE( ((size_t)finalCapacity) - ((size_t)capacity) );
+ ACCUMSIZE( newCapacity - capacity );
data = (void *) newData;
- capacity = finalCapacity;
+ capacity = newCapacity;
}
return capacity;
@@ -332,11 +315,11 @@
bool OSData::isEqualTo(const OSMetaClassBase *obj) const
{
- OSData * otherData;
+ OSData * data;
OSString * str;
- if ((otherData = OSDynamicCast(OSData, obj)))
- return isEqualTo(otherData);
+ if ((data = OSDynamicCast(OSData, obj)))
+ return isEqualTo(data);
else if ((str = OSDynamicCast (OSString, obj)))
return isEqualTo(str);
else
@@ -392,16 +375,12 @@
unsigned int i;
const unsigned char *p;
unsigned char c;
- unsigned int serializeLength;
if (s->previouslySerialized(this)) return true;
if (!s->addXMLStartTag(this, "data")) return false;
- serializeLength = length;
- if (reserved && reserved->disableSerialization) serializeLength = 0;
-
- for (i = 0, p = (unsigned char *)data; i < serializeLength; i++, p++) {
+ for (i = 0, p = (unsigned char *)data; i < length; i++, p++) {
/* 3 bytes are encoded as 4 */
switch (i % 3) {
case 0:
@@ -438,25 +417,3 @@
return s->addXMLEndTag("data");
}
-
-void OSData::setDeallocFunction(DeallocFunction func)
-{
- if (!reserved)
- {
- reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
- if (!reserved) return;
- bzero(reserved, sizeof(ExpansionData));
- }
- reserved->deallocFunction = func;
-}
-
-void OSData::setSerializable(bool serializable)
-{
- if (!reserved)
- {
- reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
- if (!reserved) return;
- bzero(reserved, sizeof(ExpansionData));
- }
- reserved->disableSerialization = (!serializable);
-}