Loading...
--- xnu/xnu-344.2/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-4570.41.2/libkern/c++/OSSerialize.cpp
@@ -1,23 +1,29 @@
/*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
- *
- * 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.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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. 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
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
+ * 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.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/* OSSerialize.cpp created by rsulack on Wen 25-Nov-1998 */
@@ -30,6 +36,8 @@
#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
@@ -43,14 +51,6 @@
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,46 +59,64 @@
void OSSerialize::clearText()
{
- bzero((void *)data, capacity);
- length = 1;
- tag = 0;
+ if (binary)
+ {
+ length = sizeof(kOSSerializeBinarySignature);
+ bzero(&data[length], capacity - length);
+ endCollection = true;
+ }
+ else
+ {
+ bzero((void *)data, capacity);
+ length = 1;
+ }
tags->flushCollection();
}
bool OSSerialize::previouslySerialized(const OSMetaClassBase *o)
{
char temp[16];
- OSString *tagString;
+ unsigned int tagIdx;
+
+ if (binary) return (binarySerialize(o));
// look it up
- tagString = (OSString *)tags->getObject((const OSSymbol *) o);
-
+ tagIdx = tags->getNextIndexOfObject(o, 0);
+
+// xx-review: no error checking here for addString calls!
// does it exist?
- if (tagString) {
+ if (tagIdx != -1U) {
addString("<reference IDREF=\"");
- addString(tagString->getCStringNoCopy());
+ snprintf(temp, sizeof(temp), "%u", tagIdx);
+ addString(temp);
addString("\"/>");
return true;
}
- // 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();
+ // add to tag array
+ tags->setObject(o);// XXX check return
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;
- if (!addString(((OSString *)tags->getObject((const OSSymbol *)o))->getCStringNoCopy()))
+ tagIdx = tags->getNextIndexOfObject(o, 0);
+ assert(tagIdx != -1U);
+ snprintf(temp, sizeof(temp), "%u", tagIdx);
+ if (!addString(temp))
return false;
if (!addChar('\"')) return false;
if (!addChar('>')) return false;
@@ -117,6 +135,12 @@
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;
@@ -141,20 +165,28 @@
if (!super::init())
return false;
- tags = OSDictionary::withCapacity(32);
+ tags = OSArray::withCapacity(256);
if (!tags) {
return false;
}
- tag = 0;
length = 1;
- capacity = (inCapacity) ? round_page(inCapacity) : round_page(1);
+
+ if (!inCapacity) {
+ inCapacity = 1;
+ }
+ if (round_page_overflow(inCapacity, &capacity)) {
+ tags->release();
+ tags = 0;
+ return false;
+ }
+
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);
+ kern_return_t rc = kmem_alloc(kernel_map, (vm_offset_t *)&data, capacity, IOMemoryTag(kernel_map));
if (rc) {
tags->release();
tags = 0;
@@ -163,7 +195,7 @@
bzero((void *)data, capacity);
- ACCUMSIZE(capacity);
+ OSCONTAINER_ACCUMSIZE(capacity);
return true;
}
@@ -173,7 +205,7 @@
OSSerialize *me = new OSSerialize;
if (me && !me->initWithCapacity(inCapacity)) {
- me->free();
+ me->release();
return 0;
}
@@ -196,20 +228,22 @@
if (newCapacity <= capacity)
return capacity;
- // round up
- newCapacity = round_page(newCapacity);
+ if (round_page_overflow(newCapacity, &newCapacity)) {
+ return capacity;
+ }
kern_return_t rc = kmem_realloc(kernel_map,
(vm_offset_t)data,
capacity,
(vm_offset_t *)&newData,
- newCapacity);
+ newCapacity,
+ VM_KERN_MEMORY_IOKIT);
if (!rc) {
- ACCUMSIZE(newCapacity);
+ OSCONTAINER_ACCUMSIZE(newCapacity);
// kmem realloc does not free the old address range
kmem_free(kernel_map, (vm_offset_t)data, capacity);
- ACCUMSIZE(-capacity);
+ OSCONTAINER_ACCUMSIZE(-((size_t)capacity));
// kmem realloc does not zero out the new memory
// and this could end up going to user land
@@ -229,7 +263,7 @@
if (data) {
kmem_free(kernel_map, (vm_offset_t)data, capacity);
- ACCUMSIZE( -capacity );
+ OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
}
super::free();
}
@@ -238,7 +272,7 @@
OSDefineMetaClassAndStructors(OSSerializer, OSObject)
OSSerializer * OSSerializer::forTarget( void * target,
- OSSerializerCallback callback, void * ref = 0 )
+ OSSerializerCallback callback, void * ref )
{
OSSerializer * thing;