Loading...
--- xnu/xnu-792.12.6/libkern/c++/OSSymbol.cpp
+++ xnu/xnu-344/libkern/c++/OSSymbol.cpp
@@ -1,31 +1,23 @@
/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_OSREFERENCE_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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 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
+ * 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@
*/
/* IOSymbol.cpp created by gvdl on Fri 1998-11-17 */
@@ -101,7 +93,7 @@
inline void closeGate() { mutex_lock(poolGate); };
inline void openGate() { mutex_unlock(poolGate); };
- OSSymbol *findSymbol(const char *cString) const;
+ OSSymbol *findSymbol(const char *cString, OSSymbol ***replace) const;
OSSymbol *insertSymbol(OSSymbol *sym);
void removeSymbol(OSSymbol *sym);
@@ -218,7 +210,7 @@
insertSymbol(insert);
}
-OSSymbol *OSSymbolPool::findSymbol(const char *cString) const
+OSSymbol *OSSymbolPool::findSymbol(const char *cString, OSSymbol ***replace) const
{
Bucket *thisBucket;
unsigned int j, inLen, hash;
@@ -228,6 +220,8 @@
thisBucket = &buckets[hash % nBuckets];
j = thisBucket->count;
+ *replace = NULL;
+
if (!j)
return 0;
@@ -235,16 +229,28 @@
probeSymbol = (OSSymbol *) thisBucket->symbolP;
if (inLen == probeSymbol->length
- && (strcmp(probeSymbol->string, cString) == 0))
- return probeSymbol;
+ && (strcmp(probeSymbol->string, cString) == 0)) {
+ probeSymbol->retain();
+ if (probeSymbol->getRetainCount() != 0xffff)
+ return probeSymbol;
+ else
+ // replace this one
+ *replace = (OSSymbol **) &thisBucket->symbolP;
+ }
return 0;
}
for (list = thisBucket->symbolP; j--; list++) {
probeSymbol = *list;
if (inLen == probeSymbol->length
- && (strcmp(probeSymbol->string, cString) == 0))
- return probeSymbol;
+ && (strcmp(probeSymbol->string, cString) == 0)) {
+ probeSymbol->retain();
+ if (probeSymbol->getRetainCount() != 0xffff)
+ return probeSymbol;
+ else
+ // replace this one
+ *replace = list;
+ }
}
return 0;
@@ -265,7 +271,7 @@
thisBucket->symbolP = (OSSymbol **) sym;
thisBucket->count++;
count++;
- return sym;
+ return 0;
}
if (j == 1) {
@@ -286,7 +292,7 @@
if (count > nBuckets)
reconstructSymbols();
- return sym;
+ return 0;
}
for (list = thisBucket->symbolP; j--; list++) {
@@ -309,7 +315,7 @@
if (count > nBuckets)
reconstructSymbols();
- return sym;
+ return 0;
}
void OSSymbolPool::removeSymbol(OSSymbol *sym)
@@ -433,62 +439,48 @@
const OSSymbol *OSSymbol::withCString(const char *cString)
{
+ OSSymbol **replace;
+
pool->closeGate();
- OSSymbol *oldSymb = pool->findSymbol(cString);
- if (!oldSymb) {
- OSSymbol *newSymb = new OSSymbol;
- if (!newSymb) {
- pool->openGate();
- return newSymb;
- }
-
- if (newSymb->OSString::initWithCString(cString))
- oldSymb = pool->insertSymbol(newSymb);
-
- if (newSymb == oldSymb) {
- pool->openGate();
- return newSymb; // return the newly created & inserted symbol.
- }
- else
- // Somebody else inserted the new symbol so free our copy
+ 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();
- }
-
- oldSymb->retain(); // Retain the old symbol before releasing the lock.
-
+ newSymb = 0;
+ }
+ }
pool->openGate();
- return oldSymb;
+
+ return newSymb;
}
const OSSymbol *OSSymbol::withCStringNoCopy(const char *cString)
{
+ OSSymbol **replace;
+
pool->closeGate();
- OSSymbol *oldSymb = pool->findSymbol(cString);
- if (!oldSymb) {
- OSSymbol *newSymb = new OSSymbol;
- if (!newSymb) {
- pool->openGate();
- return newSymb;
- }
-
- if (newSymb->OSString::initWithCStringNoCopy(cString))
- oldSymb = pool->insertSymbol(newSymb);
-
- if (newSymb == oldSymb) {
- pool->openGate();
- return newSymb; // return the newly created & inserted symbol.
- }
- else
- // Somebody else inserted the new symbol so free our copy
+ 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();
- }
-
- oldSymb->retain(); // Retain the old symbol before releasing the lock.
-
+ newSymb = 0;
+ }
+ }
pool->openGate();
- return oldSymb;
+
+ return newSymb;
}
void OSSymbol::checkForPageUnload(void *startAddr, void *endAddr)
@@ -511,21 +503,12 @@
pool->openGate();
}
-void OSSymbol::taggedRelease(const void *tag) const
-{
- super::taggedRelease(tag);
-}
-
-void OSSymbol::taggedRelease(const void *tag, const int when) const
+void OSSymbol::free()
{
pool->closeGate();
- super::taggedRelease(tag, when);
+ pool->removeSymbol(this);
pool->openGate();
-}
-
-void OSSymbol::free()
-{
- pool->removeSymbol(this);
+
super::free();
}