Loading...
--- xnu/xnu-4570.20.62/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-792/libkern/c++/OSSerialize.cpp
@@ -1,29 +1,23 @@
/*
- * 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 */
@@ -36,8 +30,6 @@
#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 +43,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,64 +59,46 @@
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();
}
bool OSSerialize::previouslySerialized(const OSMetaClassBase *o)
{
char temp[16];
- unsigned int tagIdx;
-
- if (binary) return (binarySerialize(o));
+ OSString *tagString;
// look it up
- tagIdx = tags->getNextIndexOfObject(o, 0);
-
-// xx-review: no error checking here for addString calls!
+ tagString = (OSString *)tags->getObject((const OSSymbol *) o);
+
// does it exist?
- if (tagIdx != -1U) {
+ if (tagString) {
addString("<reference IDREF=\"");
- snprintf(temp, sizeof(temp), "%u", tagIdx);
- addString(temp);
+ addString(tagString->getCStringNoCopy());
addString("\"/>");
return true;
}
- // add to tag array
- tags->setObject(o);// XXX check return
+ // build a tag
+ sprintf(temp, "%u", tag++);
+ tagString = OSString::withCString(temp);
+
+ // add to tag dictionary
+ tags->setObject((const OSSymbol *) o, tagString);// XXX check return
+ tagString->release();
return false;
}
bool OSSerialize::addXMLStartTag(const OSMetaClassBase *o, const char *tagString)
{
- char temp[16];
- unsigned int tagIdx;
-
- if (binary)
- {
- printf("class %s: xml serialize\n", o->getMetaClass()->getClassName());
- return (false);
- }
if (!addChar('<')) return false;
if (!addString(tagString)) return false;
if (!addString(" ID=\"")) return false;
- tagIdx = tags->getNextIndexOfObject(o, 0);
- assert(tagIdx != -1U);
- snprintf(temp, sizeof(temp), "%u", tagIdx);
- if (!addString(temp))
+ if (!addString(((OSString *)tags->getObject((const OSSymbol *)o))->getCStringNoCopy()))
return false;
if (!addChar('\"')) return false;
if (!addChar('>')) return false;
@@ -135,12 +117,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;
@@ -165,28 +141,20 @@
if (!super::init())
return false;
- tags = OSArray::withCapacity(256);
+ tags = OSDictionary::withCapacity(32);
if (!tags) {
return false;
}
+ tag = 0;
length = 1;
-
- if (!inCapacity) {
- inCapacity = 1;
- }
- if (round_page_overflow(inCapacity, &capacity)) {
- tags->release();
- tags = 0;
- return false;
- }
-
+ 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));
+ kern_return_t rc = kmem_alloc(kernel_map, (vm_offset_t *)&data, capacity);
if (rc) {
tags->release();
tags = 0;
@@ -195,7 +163,7 @@
bzero((void *)data, capacity);
- OSCONTAINER_ACCUMSIZE(capacity);
+ ACCUMSIZE(capacity);
return true;
}
@@ -228,22 +196,20 @@
if (newCapacity <= capacity)
return capacity;
- if (round_page_overflow(newCapacity, &newCapacity)) {
- 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);
+ newCapacity);
if (!rc) {
- OSCONTAINER_ACCUMSIZE(newCapacity);
+ 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));
+ ACCUMSIZE(-capacity);
// kmem realloc does not zero out the new memory
// and this could end up going to user land
@@ -263,7 +229,7 @@
if (data) {
kmem_free(kernel_map, (vm_offset_t)data, capacity);
- OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
+ ACCUMSIZE( -capacity );
}
super::free();
}