Loading...
--- xnu/xnu-3248.50.21/libkern/c++/OSSymbol.cpp
+++ xnu/xnu-1504.7.4/libkern/c++/OSSymbol.cpp
@@ -30,7 +30,9 @@
#include <string.h>
#include <sys/cdefs.h>
-#include <kern/locks.h>
+__BEGIN_DECLS
+#include <kern/lock.h>
+__END_DECLS
#include <libkern/c++/OSSymbol.h>
#include <libkern/c++/OSLib.h>
@@ -38,7 +40,16 @@
#define super OSString
-typedef struct { unsigned int i, j; } OSSymbolPoolState;
+typedef struct { int i, j; } OSSymbolPoolState;
+
+#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
#define INITIAL_POOL_SIZE (exp2ml(1 + log2(kInitBucketCount)))
@@ -117,8 +128,8 @@
void * OSSymbolPool::operator new(size_t size)
{
- void *mem = (void *)kalloc_tag(size, VM_KERN_MEMORY_LIBKERN);
- OSMETA_ACCUMSIZE(size);
+ void *mem = (void *)kalloc(size);
+ ACCUMSIZE(size);
assert(mem);
bzero(mem, size);
@@ -128,7 +139,7 @@
void OSSymbolPool::operator delete(void *mem, size_t size)
{
kfree(mem, size);
- OSMETA_ACCUMSIZE(-size);
+ ACCUMSIZE(-size);
}
extern lck_grp_t *IOLockGroup;
@@ -137,8 +148,8 @@
{
count = 0;
nBuckets = INITIAL_POOL_SIZE;
- buckets = (Bucket *) kalloc_tag(nBuckets * sizeof(Bucket), VM_KERN_MEMORY_LIBKERN);
- OSMETA_ACCUMSIZE(nBuckets * sizeof(Bucket));
+ buckets = (Bucket *) kalloc(nBuckets * sizeof(Bucket));
+ ACCUMSIZE(nBuckets * sizeof(Bucket));
if (!buckets)
return false;
@@ -161,15 +172,8 @@
OSSymbolPool::~OSSymbolPool()
{
if (buckets) {
- Bucket *thisBucket;
- for (thisBucket = &buckets[0]; thisBucket < &buckets[nBuckets]; thisBucket++) {
- if (thisBucket->count > 1) {
- kfree(thisBucket->symbolP, thisBucket->count * sizeof(OSSymbol *));
- OSMETA_ACCUMSIZE(-(thisBucket->count * sizeof(OSSymbol *)));
- }
- }
kfree(buckets, nBuckets * sizeof(Bucket));
- OSMETA_ACCUMSIZE(-(nBuckets * sizeof(Bucket)));
+ ACCUMSIZE(-(nBuckets * sizeof(Bucket)));
}
if (poolGate)
@@ -244,8 +248,8 @@
count = 0;
nBuckets = new_nBuckets;
- buckets = (Bucket *) kalloc_tag(nBuckets * sizeof(Bucket), VM_KERN_MEMORY_LIBKERN);
- OSMETA_ACCUMSIZE(nBuckets * sizeof(Bucket));
+ buckets = (Bucket *) kalloc(nBuckets * sizeof(Bucket));
+ ACCUMSIZE(nBuckets * sizeof(Bucket));
/* @@@ gvdl: Zero test and panic if can't set up pool */
bzero(buckets, nBuckets * sizeof(Bucket));
@@ -311,8 +315,8 @@
&& strncmp(probeSymbol->string, cString, probeSymbol->length) == 0)
return probeSymbol;
- list = (OSSymbol **) kalloc_tag(2 * sizeof(OSSymbol *), VM_KERN_MEMORY_LIBKERN);
- OSMETA_ACCUMSIZE(2 * sizeof(OSSymbol *));
+ list = (OSSymbol **) kalloc(2 * sizeof(OSSymbol *));
+ ACCUMSIZE(2 * sizeof(OSSymbol *));
/* @@@ gvdl: Zero test and panic if can't set up pool */
list[0] = sym;
list[1] = probeSymbol;
@@ -333,13 +337,13 @@
j = thisBucket->count++;
count++;
- list = (OSSymbol **) kalloc_tag(thisBucket->count * sizeof(OSSymbol *), VM_KERN_MEMORY_LIBKERN);
- OSMETA_ACCUMSIZE(thisBucket->count * sizeof(OSSymbol *));
+ list = (OSSymbol **) kalloc(thisBucket->count * sizeof(OSSymbol *));
+ ACCUMSIZE(thisBucket->count * sizeof(OSSymbol *));
/* @@@ gvdl: Zero test and panic if can't set up pool */
list[0] = sym;
bcopy(thisBucket->symbolP, list + 1, j * sizeof(OSSymbol *));
kfree(thisBucket->symbolP, j * sizeof(OSSymbol *));
- OSMETA_ACCUMSIZE(-(j * sizeof(OSSymbol *)));
+ ACCUMSIZE(-(j * sizeof(OSSymbol *)));
thisBucket->symbolP = list;
GROW_POOL();
@@ -357,11 +361,8 @@
j = thisBucket->count;
list = thisBucket->symbolP;
- if (!j) {
- // couldn't find the symbol; probably means string hash changed
- panic("removeSymbol %s count %d ", sym->string ? sym->string : "no string", count);
+ if (!j)
return;
- }
if (j == 1) {
probeSymbol = (OSSymbol *) list;
@@ -373,8 +374,6 @@
SHRINK_POOL();
return;
}
- // couldn't find the symbol; probably means string hash changed
- panic("removeSymbol %s count %d ", sym->string ? sym->string : "no string", count);
return;
}
@@ -383,7 +382,7 @@
if (probeSymbol == sym) {
thisBucket->symbolP = (OSSymbol **) list[1];
kfree(list, 2 * sizeof(OSSymbol *));
- OSMETA_ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
+ ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
count--;
thisBucket->count--;
SHRINK_POOL();
@@ -394,14 +393,12 @@
if (probeSymbol == sym) {
thisBucket->symbolP = (OSSymbol **) list[0];
kfree(list, 2 * sizeof(OSSymbol *));
- OSMETA_ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
+ ACCUMSIZE(-(2 * sizeof(OSSymbol *)));
count--;
thisBucket->count--;
SHRINK_POOL();
return;
}
- // couldn't find the symbol; probably means string hash changed
- panic("removeSymbol %s count %d ", sym->string ? sym->string : "no string", count);
return;
}
@@ -410,8 +407,8 @@
if (probeSymbol == sym) {
list = (OSSymbol **)
- kalloc_tag((thisBucket->count-1) * sizeof(OSSymbol *), VM_KERN_MEMORY_LIBKERN);
- OSMETA_ACCUMSIZE((thisBucket->count-1) * sizeof(OSSymbol *));
+ kalloc((thisBucket->count-1) * sizeof(OSSymbol *));
+ ACCUMSIZE((thisBucket->count-1) * sizeof(OSSymbol *));
if (thisBucket->count-1 != j)
bcopy(thisBucket->symbolP, list,
(thisBucket->count-1-j) * sizeof(OSSymbol *));
@@ -420,15 +417,13 @@
list + thisBucket->count-1-j,
j * sizeof(OSSymbol *));
kfree(thisBucket->symbolP, thisBucket->count * sizeof(OSSymbol *));
- OSMETA_ACCUMSIZE(-(thisBucket->count * sizeof(OSSymbol *)));
+ ACCUMSIZE(-(thisBucket->count * sizeof(OSSymbol *)));
thisBucket->symbolP = list;
count--;
thisBucket->count--;
return;
}
}
- // couldn't find the symbol; probably means string hash changed
- panic("removeSymbol %s count %d ", sym->string ? sym->string : "no string", count);
}
/*
@@ -454,7 +449,7 @@
pool = new OSSymbolPool;
assert(pool);
- if (pool && !pool->init()) {
+ if (!pool->init()) {
delete pool;
assert(false);
};
@@ -546,7 +541,12 @@
state = pool->initHashState();
while ( (probeSymbol = pool->nextHashState(&state)) ) {
if (probeSymbol->string >= startAddr && probeSymbol->string < endAddr) {
- probeSymbol->OSString::initWithCString(probeSymbol->string);
+ const char *oldString = probeSymbol->string;
+
+ probeSymbol->string = (char *) kalloc(probeSymbol->length);
+ ACCUMSIZE(probeSymbol->length);
+ bcopy(oldString, probeSymbol->string, probeSymbol->length);
+ probeSymbol->flags &= ~kOSStringNoCopy;
}
}
pool->openGate();
@@ -592,33 +592,3 @@
else
return false;
}
-
-unsigned int
-OSSymbol::bsearch(
- const void * key,
- const void * array,
- unsigned int arrayCount,
- size_t memberSize)
-{
- const void **p;
- unsigned int baseIdx = 0;
- unsigned int lim;
-
- for (lim = arrayCount; lim; lim >>= 1)
- {
- p = (typeof(p)) (((uintptr_t) array) + (baseIdx + (lim >> 1)) * memberSize);
- if (key == *p)
- {
- return (baseIdx + (lim >> 1));
- }
- if (key > *p)
- {
- // move right
- baseIdx += (lim >> 1) + 1;
- lim--;
- }
- // else move left
- }
- // not found, insertion point here
- return (baseIdx + (lim >> 1));
-}