Loading...
--- xnu/xnu-792.6.70/libkern/c++/OSSymbol.cpp
+++ xnu/xnu-201.14/libkern/c++/OSSymbol.cpp
@@ -21,7 +21,6 @@
*/
/* IOSymbol.cpp created by gvdl on Fri 1998-11-17 */
-#include <string.h>
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -30,7 +29,6 @@
#include <libkern/c++/OSSymbol.h>
#include <libkern/c++/OSLib.h>
-#include <string.h>
#define super OSString
@@ -95,7 +93,7 @@
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);
@@ -227,15 +225,18 @@
probeSymbol = (OSSymbol *) thisBucket->symbolP;
if (inLen == probeSymbol->length
- && (strcmp(probeSymbol->string, cString) == 0))
+ && (strcmp(probeSymbol->string, cString) == 0)
+ && (probeSymbol->getRetainCount() >= 1)) // WRONG need when
return probeSymbol;
- return 0;
+ else
+ return 0;
}
for (list = thisBucket->symbolP; j--; list++) {
probeSymbol = *list;
if (inLen == probeSymbol->length
- && (strcmp(probeSymbol->string, cString) == 0))
+ && (strcmp(probeSymbol->string, cString) == 0)
+ && (probeSymbol->getRetainCount() >= 1)) // WRONG need when
return probeSymbol;
}
@@ -257,7 +258,7 @@
thisBucket->symbolP = (OSSymbol **) sym;
thisBucket->count++;
count++;
- return sym;
+ return 0;
}
if (j == 1) {
@@ -278,7 +279,7 @@
if (count > nBuckets)
reconstructSymbols();
- return sym;
+ return 0;
}
for (list = thisBucket->symbolP; j--; list++) {
@@ -301,16 +302,16 @@
if (count > nBuckets)
reconstructSymbols();
- return sym;
-}
-
-void OSSymbolPool::removeSymbol(OSSymbol *sym)
+ return 0;
+}
+
+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;
@@ -321,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--;
@@ -332,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 *)));
@@ -342,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 *)));
@@ -355,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 *));
@@ -427,60 +432,40 @@
{
pool->closeGate();
- OSSymbol *oldSymb = pool->findSymbol(cString);
- if (!oldSymb) {
- OSSymbol *newSymb = new OSSymbol;
- if (!newSymb) {
- pool->openGate();
- return newSymb;
- }
-
+ OSSymbol *newSymb = pool->findSymbol(cString);
+ if (newSymb)
+ newSymb->retain();
+ else if ( (newSymb = new OSSymbol) ) {
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
- newSymb->OSString::free();
- }
-
- oldSymb->retain(); // Retain the old symbol before releasing the lock.
-
+ pool->insertSymbol(newSymb);
+ else {
+ newSymb->free();
+ newSymb = 0;
+ }
+ }
pool->openGate();
- return oldSymb;
+
+ return newSymb;
}
const OSSymbol *OSSymbol::withCStringNoCopy(const char *cString)
{
pool->closeGate();
- OSSymbol *oldSymb = pool->findSymbol(cString);
- if (!oldSymb) {
- OSSymbol *newSymb = new OSSymbol;
- if (!newSymb) {
- pool->openGate();
- return newSymb;
- }
-
+ OSSymbol *newSymb = pool->findSymbol(cString);
+ if (newSymb)
+ newSymb->retain();
+ else if ( (newSymb = new OSSymbol) ) {
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
- newSymb->OSString::free();
- }
-
- oldSymb->retain(); // Retain the old symbol before releasing the lock.
-
+ pool->insertSymbol(newSymb);
+ else {
+ newSymb->free();
+ newSymb = 0;
+ }
+ }
pool->openGate();
- return oldSymb;
+
+ return newSymb;
}
void OSSymbol::checkForPageUnload(void *startAddr, void *endAddr)
@@ -503,21 +488,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(string);
pool->openGate();
-}
-
-void OSSymbol::free()
-{
- pool->removeSymbol(this);
+
super::free();
}