Loading...
--- xnu/xnu-3247.1.106/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-201/libkern/c++/OSSerialize.cpp
@@ -1,43 +1,29 @@
/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * 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@
*/
/* OSSerialize.cpp created by rsulack on Wen 25-Nov-1998 */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-#include <vm/vm_kern.h>
-__END_DECLS
#include <libkern/c++/OSContainers.h>
#include <libkern/c++/OSLib.h>
#include <libkern/c++/OSDictionary.h>
-#include <libkern/OSSerializeBinary.h>
-#include <IOKit/IOLib.h>
#define super OSObject
@@ -51,6 +37,14 @@
OSMetaClassDefineReservedUnused(OSSerialize, 6);
OSMetaClassDefineReservedUnused(OSSerialize, 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
char * OSSerialize::text() const
{
@@ -59,17 +53,8 @@
void OSSerialize::clearText()
{
- if (binary)
- {
- length = sizeof(kOSSerializeBinarySignature);
- bzero(&data[length], capacity - length);
- endCollection = true;
- }
- else
- {
- bzero((void *)data, capacity);
- length = 1;
- }
+ bzero((void *)data, capacity);
+ length = 1;
tag = 0;
tags->flushCollection();
}
@@ -79,12 +64,9 @@
char temp[16];
OSString *tagString;
- if (binary) return (binarySerialize(o));
-
// look it up
tagString = (OSString *)tags->getObject((const OSSymbol *) o);
-// xx-review: no error checking here for addString calls!
// does it exist?
if (tagString) {
addString("<reference IDREF=\"");
@@ -94,7 +76,7 @@
}
// build a tag
- snprintf(temp, sizeof(temp), "%u", tag++);
+ sprintf(temp, "%u", tag++);
tagString = OSString::withCString(temp);
// add to tag dictionary
@@ -106,11 +88,6 @@
bool OSSerialize::addXMLStartTag(const OSMetaClassBase *o, const char *tagString)
{
- if (binary)
- {
- printf("class %s: xml serialize\n", o->getMetaClass()->getClassName());
- return (false);
- }
if (!addChar('<')) return false;
if (!addString(tagString)) return false;
@@ -134,12 +111,6 @@
bool OSSerialize::addChar(const char c)
{
- if (binary)
- {
- printf("xml serialize\n");
- return (false);
- }
-
// add char, possibly extending our capacity
if (length >= capacity && length >=ensureCapacity(capacity+capacityIncrement))
return false;
@@ -171,14 +142,13 @@
tag = 0;
length = 1;
- capacity = (inCapacity) ? round_page_32(inCapacity) : round_page_32(1);
- capacityIncrement = capacity;
-
- // allocate from the kernel map so that we can safely map this data
- // into user space (the primary use of the OSSerialize object)
-
- kern_return_t rc = kmem_alloc(kernel_map, (vm_offset_t *)&data, capacity, IOMemoryTag(kernel_map));
- if (rc) {
+ capacity = inCapacity;
+ capacityIncrement = (capacity)? capacity : 256;
+
+ capacity = (((capacity - 1) / capacityIncrement) + 1)
+ * capacityIncrement;
+ data = (char *) kalloc(capacity);
+ if (!data) {
tags->release();
tags = 0;
return false;
@@ -186,7 +156,7 @@
bzero((void *)data, capacity);
- OSCONTAINER_ACCUMSIZE(capacity);
+ ACCUMSIZE(capacity);
return true;
}
@@ -196,7 +166,7 @@
OSSerialize *me = new OSSerialize;
if (me && !me->initWithCapacity(inCapacity)) {
- me->release();
+ me->free();
return 0;
}
@@ -215,32 +185,25 @@
unsigned int OSSerialize::ensureCapacity(unsigned int newCapacity)
{
char *newData;
+ unsigned int oldCapacity;
if (newCapacity <= capacity)
return capacity;
// round up
- newCapacity = round_page_32(newCapacity);
-
- kern_return_t rc = kmem_realloc(kernel_map,
- (vm_offset_t)data,
- capacity,
- (vm_offset_t *)&newData,
- newCapacity,
- VM_KERN_MEMORY_IOKIT);
- if (!rc) {
- OSCONTAINER_ACCUMSIZE(newCapacity);
-
- // kmem realloc does not free the old address range
- kmem_free(kernel_map, (vm_offset_t)data, capacity);
- OSCONTAINER_ACCUMSIZE(-((size_t)capacity));
-
- // kmem realloc does not zero out the new memory
- // and this could end up going to user land
- bzero(&newData[capacity], newCapacity - capacity);
-
- data = newData;
- capacity = newCapacity;
+ newCapacity = (((newCapacity - 1) / capacityIncrement) + 1)
+ * capacityIncrement;
+ newData = (char *) kalloc(newCapacity);
+ if (newData) {
+ oldCapacity = capacity;
+
+ ACCUMSIZE(newCapacity - oldCapacity);
+
+ bcopy(data, newData, oldCapacity);
+ bzero(&newData[capacity], newCapacity - oldCapacity);
+ kfree((vm_offset_t)data, oldCapacity);
+ data = newData;
+ capacity = newCapacity;
}
return capacity;
@@ -252,8 +215,8 @@
tags->release();
if (data) {
- kmem_free(kernel_map, (vm_offset_t)data, capacity);
- OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
+ kfree((vm_offset_t)data, capacity);
+ ACCUMSIZE( -capacity );
}
super::free();
}
@@ -262,7 +225,7 @@
OSDefineMetaClassAndStructors(OSSerializer, OSObject)
OSSerializer * OSSerializer::forTarget( void * target,
- OSSerializerCallback callback, void * ref )
+ OSSerializerCallback callback, void * ref = 0 )
{
OSSerializer * thing;