Loading...
--- xnu/xnu-344.21.73/libkern/c++/OSSymbol.cpp
+++ xnu/xnu-201/libkern/c++/OSSymbol.cpp
@@ -3,28 +3,24 @@
*
* @APPLE_LICENSE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * 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 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.
- *
- * 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_LICENSE_HEADER_END@
*/
/* IOSymbol.cpp created by gvdl on Fri 1998-11-17 */
-#include <string.h>
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -33,7 +29,6 @@
#include <libkern/c++/OSSymbol.h>
#include <libkern/c++/OSLib.h>
-#include <string.h>
#define super OSString
@@ -96,9 +91,9 @@
inline void closeGate() { mutex_lock(poolGate); };
inline void openGate() { mutex_unlock(poolGate); };
- OSSymbol *findSymbol(const char *cString, OSSymbol ***replace) const;
+ OSSymbol *findSymbol(const char *cString) const;
OSSymbol *insertSymbol(OSSymbol *sym);
- void removeSymbol(OSSymbol *sym);
+ void removeSymbol(const char *cString);
OSSymbolPoolState initHashState();
OSSymbol *nextHashState(OSSymbolPoolState *stateP);
@@ -213,7 +208,7 @@
insertSymbol(insert);
}
-OSSymbol *OSSymbolPool::findSymbol(const char *cString, OSSymbol ***replace) const
+OSSymbol *OSSymbolPool::findSymbol(const char *cString) const
{
Bucket *thisBucket;
unsigned int j, inLen, hash;
@@ -223,8 +218,6 @@
thisBucket = &buckets[hash % nBuckets];
j = thisBucket->count;
- *replace = NULL;
-
if (!j)
return 0;
@@ -232,28 +225,19 @@
probeSymbol = (OSSymbol *) thisBucket->symbolP;
if (inLen == probeSymbol->length
- && (strcmp(probeSymbol->string, cString) == 0)) {
- probeSymbol->retain();
- if (probeSymbol->getRetainCount() != 0xffff)
- return probeSymbol;
- else
- // replace this one
- *replace = (OSSymbol **) &thisBucket->symbolP;
- }
- return 0;
+ && (strcmp(probeSymbol->string, cString) == 0)
+ && (probeSymbol->getRetainCount() >= 1)) // WRONG need when
+ return probeSymbol;
+ else
+ return 0;
}
for (list = thisBucket->symbolP; j--; list++) {
probeSymbol = *list;
if (inLen == probeSymbol->length
- && (strcmp(probeSymbol->string, cString) == 0)) {
- probeSymbol->retain();
- if (probeSymbol->getRetainCount() != 0xffff)
- return probeSymbol;
- else
- // replace this one
- *replace = list;
- }
+ && (strcmp(probeSymbol->string, cString) == 0)
+ && (probeSymbol->getRetainCount() >= 1)) // WRONG need when
+ return probeSymbol;
}
return 0;
@@ -321,13 +305,13 @@
return 0;
}
-void OSSymbolPool::removeSymbol(OSSymbol *sym)
+void OSSymbolPool::removeSymbol(const char *cString)
{
Bucket *thisBucket;
unsigned int j, inLen, hash;
OSSymbol *probeSymbol, **list;
- hashSymbol(sym->string, &hash, &inLen); inLen++;
+ hashSymbol(cString, &hash, &inLen); inLen++;
thisBucket = &buckets[hash % nBuckets];
j = thisBucket->count;
list = thisBucket->symbolP;
@@ -338,7 +322,8 @@
if (j == 1) {
probeSymbol = (OSSymbol *) list;
- if (probeSymbol == sym) {
+ if (inLen == probeSymbol->length
+ && strcmp(probeSymbol->string, cString) == 0) {
thisBucket->symbolP = 0;
count--;
thisBucket->count--;
@@ -349,7 +334,8 @@
if (j == 2) {
probeSymbol = list[0];
- if (probeSymbol == sym) {
+ if (inLen == probeSymbol->length
+ && strcmp(probeSymbol->string, cString) == 0) {
thisBucket->symbolP = (OSSymbol **) list[1];
kfree((vm_offset_t)list, 2 * sizeof(OSSymbol *));
ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
@@ -359,7 +345,8 @@
}
probeSymbol = list[1];
- if (probeSymbol == sym) {
+ if (inLen == probeSymbol->length
+ && strcmp(probeSymbol->string, cString) == 0) {
thisBucket->symbolP = (OSSymbol **) list[0];
kfree((vm_offset_t)list, 2 * sizeof(OSSymbol *));
ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
@@ -372,7 +359,8 @@
for (; j--; list++) {
probeSymbol = *list;
- if (probeSymbol == sym) {
+ if (inLen == probeSymbol->length
+ && strcmp(probeSymbol->string, cString) == 0) {
list = (OSSymbol **)
kalloc((thisBucket->count-1) * sizeof(OSSymbol *));
@@ -442,19 +430,16 @@
const OSSymbol *OSSymbol::withCString(const char *cString)
{
- OSSymbol **replace;
-
pool->closeGate();
- OSSymbol *newSymb = pool->findSymbol(cString, &replace);
- if (!newSymb && (newSymb = new OSSymbol) ) {
- if (newSymb->OSString::initWithCString(cString)) {
- if (replace)
- *replace = newSymb;
- else
- pool->insertSymbol(newSymb);
- } else {
- newSymb->OSString::free();
+ OSSymbol *newSymb = pool->findSymbol(cString);
+ if (newSymb)
+ newSymb->retain();
+ else if ( (newSymb = new OSSymbol) ) {
+ if (newSymb->OSString::initWithCString(cString))
+ pool->insertSymbol(newSymb);
+ else {
+ newSymb->free();
newSymb = 0;
}
}
@@ -465,19 +450,16 @@
const OSSymbol *OSSymbol::withCStringNoCopy(const char *cString)
{
- OSSymbol **replace;
-
pool->closeGate();
- OSSymbol *newSymb = pool->findSymbol(cString, &replace);
- if (!newSymb && (newSymb = new OSSymbol) ) {
- if (newSymb->OSString::initWithCStringNoCopy(cString)) {
- if (replace)
- *replace = newSymb;
- else
- pool->insertSymbol(newSymb);
- } else {
- newSymb->OSString::free();
+ OSSymbol *newSymb = pool->findSymbol(cString);
+ if (newSymb)
+ newSymb->retain();
+ else if ( (newSymb = new OSSymbol) ) {
+ if (newSymb->OSString::initWithCStringNoCopy(cString))
+ pool->insertSymbol(newSymb);
+ else {
+ newSymb->free();
newSymb = 0;
}
}
@@ -509,7 +491,7 @@
void OSSymbol::free()
{
pool->closeGate();
- pool->removeSymbol(this);
+ pool->removeSymbol(string);
pool->openGate();
super::free();