2009-06-10 18:29:44 -07:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
2013-04-16 13:47:10 -07:00
|
|
|
* vim: set ts=8 sts=4 et sw=4 tw=99:
|
2012-05-21 04:12:37 -07:00
|
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* PR hash table package.
|
|
|
|
*/
|
2013-07-03 15:46:51 -07:00
|
|
|
|
|
|
|
#include "jshash.h"
|
|
|
|
|
|
|
|
#include "mozilla/MathAlgorithms.h"
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "jstypes.h"
|
2010-10-01 16:46:54 -07:00
|
|
|
#include "jsutil.h"
|
2007-03-22 10:30:00 -07:00
|
|
|
|
Bug 634155: Account for NewCompartment's memory, and change allocation APIs (r=nnethercote)
This changes the allocation API, in the following way:
js_malloc -> {cx->,rt->,OffTheBooks::}malloc
js_calloc -> {cx->,rt->,OffTheBooks::}calloc
js_realloc -> {cx->,rt->,OffTheBooks::}realloc
js_free -> {cx->,rt->,Foreground::,UnwantedForeground::}free
js_new -> {cx->,rt->,OffTheBooks::}new_
js_new_array -> {cx->,rt->,OffTheBooks::}new_array
js_delete -> {cx->,rt->,Foreground::,UnwantedForeground::}delete_
This is to move as many allocations as possible through a JSContext (so that they may be aken into account by gcMallocBytes) and to move as many deallocations to the background as possible (except on error paths).
2011-03-31 01:13:49 -07:00
|
|
|
using namespace js;
|
|
|
|
|
2013-07-03 15:46:51 -07:00
|
|
|
using mozilla::CeilingLog2Size;
|
|
|
|
|
2007-03-22 10:30:00 -07:00
|
|
|
/* Compute the number of buckets in ht */
|
|
|
|
#define NBUCKETS(ht) JS_BIT(JS_HASH_BITS - (ht)->shift)
|
|
|
|
|
|
|
|
/* The smallest table has 16 buckets */
|
|
|
|
#define MINBUCKETSLOG2 4
|
|
|
|
#define MINBUCKETS JS_BIT(MINBUCKETSLOG2)
|
|
|
|
|
|
|
|
/* Compute the maximum entries given n buckets that we will tolerate, ~90% */
|
|
|
|
#define OVERLOADED(n) ((n) - ((n) >> 3))
|
|
|
|
|
|
|
|
/* Compute the number of entries below which we shrink the table by half */
|
|
|
|
#define UNDERLOADED(n) (((n) > MINBUCKETS) ? ((n) >> 2) : 0)
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Stubs for default hash allocator ops.
|
|
|
|
*/
|
|
|
|
static void *
|
|
|
|
DefaultAllocTable(void *pool, size_t size)
|
|
|
|
{
|
2012-08-31 15:01:33 -07:00
|
|
|
return js_malloc(size);
|
2007-03-22 10:30:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-04-05 21:17:22 -07:00
|
|
|
DefaultFreeTable(void *pool, void *item, size_t size)
|
2007-03-22 10:30:00 -07:00
|
|
|
{
|
2012-08-31 15:01:33 -07:00
|
|
|
js_free(item);
|
2007-03-22 10:30:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static JSHashEntry *
|
|
|
|
DefaultAllocEntry(void *pool, const void *key)
|
|
|
|
{
|
2012-08-31 15:01:33 -07:00
|
|
|
return (JSHashEntry*) js_malloc(sizeof(JSHashEntry));
|
2007-03-22 10:30:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2012-02-28 15:11:11 -08:00
|
|
|
DefaultFreeEntry(void *pool, JSHashEntry *he, unsigned flag)
|
2007-03-22 10:30:00 -07:00
|
|
|
{
|
|
|
|
if (flag == HT_FREE_ENTRY)
|
2012-08-31 15:01:33 -07:00
|
|
|
js_free(he);
|
2007-03-22 10:30:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static JSHashAllocOps defaultHashAllocOps = {
|
|
|
|
DefaultAllocTable, DefaultFreeTable,
|
|
|
|
DefaultAllocEntry, DefaultFreeEntry
|
|
|
|
};
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
JSHashTable *
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
JS_NewHashTable(uint32_t n, JSHashFunction keyHash,
|
2007-03-22 10:30:00 -07:00
|
|
|
JSHashComparator keyCompare, JSHashComparator valueCompare,
|
|
|
|
JSHashAllocOps *allocOps, void *allocPriv)
|
|
|
|
{
|
|
|
|
JSHashTable *ht;
|
|
|
|
size_t nb;
|
|
|
|
|
|
|
|
if (n <= MINBUCKETS) {
|
|
|
|
n = MINBUCKETSLOG2;
|
|
|
|
} else {
|
2013-07-03 15:46:51 -07:00
|
|
|
n = CeilingLog2Size(n);
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
if (int32_t(n) < 0)
|
2007-03-22 10:30:00 -07:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!allocOps) allocOps = &defaultHashAllocOps;
|
|
|
|
|
|
|
|
ht = (JSHashTable*) allocOps->allocTable(allocPriv, sizeof *ht);
|
|
|
|
if (!ht)
|
|
|
|
return NULL;
|
|
|
|
memset(ht, 0, sizeof *ht);
|
|
|
|
ht->shift = JS_HASH_BITS - n;
|
|
|
|
n = JS_BIT(n);
|
|
|
|
nb = n * sizeof(JSHashEntry *);
|
|
|
|
ht->buckets = (JSHashEntry**) allocOps->allocTable(allocPriv, nb);
|
|
|
|
if (!ht->buckets) {
|
2009-04-05 21:17:22 -07:00
|
|
|
allocOps->freeTable(allocPriv, ht, nb);
|
2007-03-22 10:30:00 -07:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
memset(ht->buckets, 0, nb);
|
|
|
|
|
|
|
|
ht->keyHash = keyHash;
|
|
|
|
ht->keyCompare = keyCompare;
|
|
|
|
ht->valueCompare = valueCompare;
|
|
|
|
ht->allocOps = allocOps;
|
|
|
|
ht->allocPriv = allocPriv;
|
|
|
|
return ht;
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
void
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableDestroy(JSHashTable *ht)
|
|
|
|
{
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
uint32_t i, n;
|
2007-03-22 10:30:00 -07:00
|
|
|
JSHashEntry *he, **hep;
|
|
|
|
JSHashAllocOps *allocOps = ht->allocOps;
|
|
|
|
void *allocPriv = ht->allocPriv;
|
|
|
|
|
|
|
|
n = NBUCKETS(ht);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
hep = &ht->buckets[i];
|
|
|
|
while ((he = *hep) != NULL) {
|
|
|
|
*hep = he->next;
|
|
|
|
allocOps->freeEntry(allocPriv, he, HT_FREE_ENTRY);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
|
|
memset(ht->buckets, 0xDB, n * sizeof ht->buckets[0]);
|
|
|
|
#endif
|
2009-04-05 21:17:22 -07:00
|
|
|
allocOps->freeTable(allocPriv, ht->buckets, n * sizeof ht->buckets[0]);
|
2007-03-22 10:30:00 -07:00
|
|
|
#ifdef DEBUG
|
|
|
|
memset(ht, 0xDB, sizeof *ht);
|
|
|
|
#endif
|
2009-04-05 21:17:22 -07:00
|
|
|
allocOps->freeTable(allocPriv, ht, sizeof *ht);
|
2007-03-22 10:30:00 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Multiplicative hash, from Knuth 6.4.
|
|
|
|
*/
|
|
|
|
#define BUCKET_HEAD(ht, keyHash) \
|
|
|
|
(&(ht)->buckets[((keyHash) * JS_GOLDEN_RATIO) >> (ht)->shift])
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
JSHashEntry **
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableRawLookup(JSHashTable *ht, JSHashNumber keyHash, const void *key)
|
|
|
|
{
|
|
|
|
JSHashEntry *he, **hep, **hep0;
|
|
|
|
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
#ifdef JS_HASHMETER
|
2007-03-22 10:30:00 -07:00
|
|
|
ht->nlookups++;
|
|
|
|
#endif
|
|
|
|
hep = hep0 = BUCKET_HEAD(ht, keyHash);
|
|
|
|
while ((he = *hep) != NULL) {
|
|
|
|
if (he->keyHash == keyHash && ht->keyCompare(key, he->key)) {
|
|
|
|
/* Move to front of chain if not already there */
|
|
|
|
if (hep != hep0) {
|
|
|
|
*hep = he->next;
|
|
|
|
he->next = *hep0;
|
|
|
|
*hep0 = he;
|
|
|
|
}
|
|
|
|
return hep0;
|
|
|
|
}
|
|
|
|
hep = &he->next;
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
#ifdef JS_HASHMETER
|
2007-03-22 10:30:00 -07:00
|
|
|
ht->nsteps++;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
return hep;
|
|
|
|
}
|
|
|
|
|
|
|
|
static JSBool
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
Resize(JSHashTable *ht, uint32_t newshift)
|
2007-03-22 10:30:00 -07:00
|
|
|
{
|
|
|
|
size_t nb, nentries, i;
|
|
|
|
JSHashEntry **oldbuckets, *he, *next, **hep;
|
|
|
|
size_t nold = NBUCKETS(ht);
|
|
|
|
|
|
|
|
JS_ASSERT(newshift < JS_HASH_BITS);
|
|
|
|
|
|
|
|
nb = (size_t)1 << (JS_HASH_BITS - newshift);
|
|
|
|
|
|
|
|
/* Integer overflow protection. */
|
|
|
|
if (nb > (size_t)-1 / sizeof(JSHashEntry*))
|
|
|
|
return JS_FALSE;
|
|
|
|
nb *= sizeof(JSHashEntry*);
|
|
|
|
|
|
|
|
oldbuckets = ht->buckets;
|
|
|
|
ht->buckets = (JSHashEntry**)ht->allocOps->allocTable(ht->allocPriv, nb);
|
|
|
|
if (!ht->buckets) {
|
|
|
|
ht->buckets = oldbuckets;
|
|
|
|
return JS_FALSE;
|
|
|
|
}
|
|
|
|
memset(ht->buckets, 0, nb);
|
|
|
|
|
|
|
|
ht->shift = newshift;
|
|
|
|
nentries = ht->nentries;
|
|
|
|
|
|
|
|
for (i = 0; nentries != 0; i++) {
|
|
|
|
for (he = oldbuckets[i]; he; he = next) {
|
|
|
|
JS_ASSERT(nentries != 0);
|
|
|
|
--nentries;
|
|
|
|
next = he->next;
|
|
|
|
hep = BUCKET_HEAD(ht, he->keyHash);
|
|
|
|
|
|
|
|
/*
|
2009-04-05 21:17:22 -07:00
|
|
|
* We do not require unique entries, instead appending he to the
|
|
|
|
* chain starting at hep.
|
2007-03-22 10:30:00 -07:00
|
|
|
*/
|
2009-04-05 21:17:22 -07:00
|
|
|
while (*hep)
|
|
|
|
hep = &(*hep)->next;
|
|
|
|
he->next = NULL;
|
2007-03-22 10:30:00 -07:00
|
|
|
*hep = he;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
|
|
memset(oldbuckets, 0xDB, nold * sizeof oldbuckets[0]);
|
|
|
|
#endif
|
2009-04-05 21:17:22 -07:00
|
|
|
ht->allocOps->freeTable(ht->allocPriv, oldbuckets,
|
|
|
|
nold * sizeof oldbuckets[0]);
|
2007-03-22 10:30:00 -07:00
|
|
|
return JS_TRUE;
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
JSHashEntry *
|
2009-07-16 13:16:27 -07:00
|
|
|
JS_HashTableRawAdd(JSHashTable *ht, JSHashEntry **&hep,
|
2007-03-22 10:30:00 -07:00
|
|
|
JSHashNumber keyHash, const void *key, void *value)
|
|
|
|
{
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
uint32_t n;
|
2007-03-22 10:30:00 -07:00
|
|
|
JSHashEntry *he;
|
|
|
|
|
|
|
|
/* Grow the table if it is overloaded */
|
|
|
|
n = NBUCKETS(ht);
|
|
|
|
if (ht->nentries >= OVERLOADED(n)) {
|
|
|
|
if (!Resize(ht, ht->shift - 1))
|
|
|
|
return NULL;
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
#ifdef JS_HASHMETER
|
2007-03-22 10:30:00 -07:00
|
|
|
ht->ngrows++;
|
|
|
|
#endif
|
|
|
|
hep = JS_HashTableRawLookup(ht, keyHash, key);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make a new key value entry */
|
|
|
|
he = ht->allocOps->allocEntry(ht->allocPriv, key);
|
|
|
|
if (!he)
|
|
|
|
return NULL;
|
|
|
|
he->keyHash = keyHash;
|
|
|
|
he->key = key;
|
|
|
|
he->value = value;
|
|
|
|
he->next = *hep;
|
|
|
|
*hep = he;
|
|
|
|
ht->nentries++;
|
|
|
|
return he;
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
JSHashEntry *
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableAdd(JSHashTable *ht, const void *key, void *value)
|
|
|
|
{
|
|
|
|
JSHashNumber keyHash;
|
|
|
|
JSHashEntry *he, **hep;
|
|
|
|
|
|
|
|
keyHash = ht->keyHash(key);
|
|
|
|
hep = JS_HashTableRawLookup(ht, keyHash, key);
|
|
|
|
if ((he = *hep) != NULL) {
|
|
|
|
/* Hit; see if values match */
|
|
|
|
if (ht->valueCompare(he->value, value)) {
|
|
|
|
/* key,value pair is already present in table */
|
|
|
|
return he;
|
|
|
|
}
|
|
|
|
if (he->value)
|
|
|
|
ht->allocOps->freeEntry(ht->allocPriv, he, HT_FREE_VALUE);
|
|
|
|
he->value = value;
|
|
|
|
return he;
|
|
|
|
}
|
|
|
|
return JS_HashTableRawAdd(ht, hep, keyHash, key, value);
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
void
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableRawRemove(JSHashTable *ht, JSHashEntry **hep, JSHashEntry *he)
|
|
|
|
{
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
uint32_t n;
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
*hep = he->next;
|
|
|
|
ht->allocOps->freeEntry(ht->allocPriv, he, HT_FREE_ENTRY);
|
|
|
|
|
|
|
|
/* Shrink table if it's underloaded */
|
|
|
|
n = NBUCKETS(ht);
|
|
|
|
if (--ht->nentries < UNDERLOADED(n)) {
|
|
|
|
Resize(ht, ht->shift + 1);
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
#ifdef JS_HASHMETER
|
2007-03-22 10:30:00 -07:00
|
|
|
ht->nshrinks++;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
JSBool
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableRemove(JSHashTable *ht, const void *key)
|
|
|
|
{
|
|
|
|
JSHashNumber keyHash;
|
|
|
|
JSHashEntry *he, **hep;
|
|
|
|
|
|
|
|
keyHash = ht->keyHash(key);
|
|
|
|
hep = JS_HashTableRawLookup(ht, keyHash, key);
|
|
|
|
if ((he = *hep) == NULL)
|
|
|
|
return JS_FALSE;
|
|
|
|
|
|
|
|
/* Hit; remove element */
|
|
|
|
JS_HashTableRawRemove(ht, hep, he);
|
|
|
|
return JS_TRUE;
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
void *
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableLookup(JSHashTable *ht, const void *key)
|
|
|
|
{
|
|
|
|
JSHashNumber keyHash;
|
|
|
|
JSHashEntry *he, **hep;
|
|
|
|
|
|
|
|
keyHash = ht->keyHash(key);
|
|
|
|
hep = JS_HashTableRawLookup(ht, keyHash, key);
|
|
|
|
if ((he = *hep) != NULL) {
|
|
|
|
return he->value;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Iterate over the entries in the hash table calling func for each
|
|
|
|
** entry found. Stop if "f" says to (return value & JS_ENUMERATE_STOP).
|
|
|
|
** Return a count of the number of elements scanned.
|
|
|
|
*/
|
2012-07-18 17:38:10 -07:00
|
|
|
int
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableEnumerateEntries(JSHashTable *ht, JSHashEnumerator f, void *arg)
|
|
|
|
{
|
|
|
|
JSHashEntry *he, **hep, **bucket;
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
uint32_t nlimit, n, nbuckets, newlog2;
|
2007-03-22 10:30:00 -07:00
|
|
|
int rv;
|
|
|
|
|
|
|
|
nlimit = ht->nentries;
|
|
|
|
n = 0;
|
|
|
|
for (bucket = ht->buckets; n != nlimit; ++bucket) {
|
|
|
|
hep = bucket;
|
|
|
|
while ((he = *hep) != NULL) {
|
|
|
|
JS_ASSERT(n < nlimit);
|
|
|
|
rv = f(he, n, arg);
|
|
|
|
n++;
|
|
|
|
if (rv & HT_ENUMERATE_REMOVE) {
|
|
|
|
*hep = he->next;
|
|
|
|
ht->allocOps->freeEntry(ht->allocPriv, he, HT_FREE_ENTRY);
|
|
|
|
--ht->nentries;
|
|
|
|
} else {
|
|
|
|
hep = &he->next;
|
|
|
|
}
|
|
|
|
if (rv & HT_ENUMERATE_STOP) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
/* Shrink table if removal of entries made it underloaded */
|
|
|
|
if (ht->nentries != nlimit) {
|
|
|
|
JS_ASSERT(ht->nentries < nlimit);
|
|
|
|
nbuckets = NBUCKETS(ht);
|
|
|
|
if (MINBUCKETS < nbuckets && ht->nentries < UNDERLOADED(nbuckets)) {
|
2013-07-03 15:46:51 -07:00
|
|
|
newlog2 = CeilingLog2Size(ht->nentries);
|
2007-03-22 10:30:00 -07:00
|
|
|
if (newlog2 < MINBUCKETSLOG2)
|
|
|
|
newlog2 = MINBUCKETSLOG2;
|
|
|
|
|
|
|
|
/* Check that we really shrink the table. */
|
|
|
|
JS_ASSERT(JS_HASH_BITS - ht->shift > newlog2);
|
|
|
|
Resize(ht, JS_HASH_BITS - newlog2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (int)n;
|
|
|
|
}
|
|
|
|
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
#ifdef JS_HASHMETER
|
2007-03-22 10:30:00 -07:00
|
|
|
#include <stdio.h>
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
void
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableDumpMeter(JSHashTable *ht, JSHashEnumerator dump, FILE *fp)
|
|
|
|
{
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
double sqsum, mean, sigma;
|
Bug 708735 - Use <stdint.h> types in JSAPI and throughout SpiderMonkey. Continue to provide the {u,}int{8,16,32,64} and JS{Uint,Int}{8,16,32,64} integer types through a single header, however, for a simpler backout strategy -- and also to ease the transition for embedders. r=timeless on switching the jsd API to use the <stdint.h> types, r=luke, r=dmandelin
2011-12-08 19:54:10 -08:00
|
|
|
uint32_t nchains, nbuckets;
|
|
|
|
uint32_t i, n, maxChain, maxChainLen;
|
2007-03-22 10:30:00 -07:00
|
|
|
JSHashEntry *he;
|
|
|
|
|
|
|
|
sqsum = 0;
|
|
|
|
nchains = 0;
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
maxChain = maxChainLen = 0;
|
2007-03-22 10:30:00 -07:00
|
|
|
nbuckets = NBUCKETS(ht);
|
|
|
|
for (i = 0; i < nbuckets; i++) {
|
|
|
|
he = ht->buckets[i];
|
|
|
|
if (!he)
|
|
|
|
continue;
|
|
|
|
nchains++;
|
|
|
|
for (n = 0; he; he = he->next)
|
|
|
|
n++;
|
|
|
|
sqsum += n * n;
|
|
|
|
if (n > maxChainLen) {
|
|
|
|
maxChainLen = n;
|
|
|
|
maxChain = i;
|
|
|
|
}
|
|
|
|
}
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
|
|
|
|
mean = JS_MeanAndStdDev(nchains, ht->nentries, sqsum, &sigma);
|
2007-03-22 10:30:00 -07:00
|
|
|
|
|
|
|
fprintf(fp, "\nHash table statistics:\n");
|
|
|
|
fprintf(fp, " number of lookups: %u\n", ht->nlookups);
|
|
|
|
fprintf(fp, " number of entries: %u\n", ht->nentries);
|
|
|
|
fprintf(fp, " number of grows: %u\n", ht->ngrows);
|
|
|
|
fprintf(fp, " number of shrinks: %u\n", ht->nshrinks);
|
|
|
|
fprintf(fp, " mean steps per hash: %g\n", (double)ht->nsteps
|
|
|
|
/ ht->nlookups);
|
|
|
|
fprintf(fp, "mean hash chain length: %g\n", mean);
|
|
|
|
fprintf(fp, " standard deviation: %g\n", sigma);
|
|
|
|
fprintf(fp, " max hash chain length: %u\n", maxChainLen);
|
|
|
|
fprintf(fp, " max hash chain: [%u]\n", maxChain);
|
|
|
|
|
|
|
|
for (he = ht->buckets[maxChain], i = 0; he; he = he->next, i++)
|
|
|
|
if (dump(he, i, fp) != HT_ENUMERATE_NEXT)
|
|
|
|
break;
|
|
|
|
}
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
#endif /* JS_HASHMETER */
|
2007-03-22 10:30:00 -07:00
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
int
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableDump(JSHashTable *ht, JSHashEnumerator dump, FILE *fp)
|
|
|
|
{
|
|
|
|
int count;
|
|
|
|
|
|
|
|
count = JS_HashTableEnumerateEntries(ht, dump, fp);
|
* Menu of -D flags for enabling instrumentation, as a commented-out CFLAGS += setting for convenient testing. * js_FindProperty and js_LookupPropertyWithFlags return indexes into the scope and prototype chains, respectively, to support internal instrumentation, and to pave the way for the return of the property cache (bug 365851).. * jsutil.[ch] JSBasicStats struct and functions for computing mean/sigma/max and auto-scaling histogram. * JS_SCOPE_DEPTH_METER instrumentation for compile- and run-time scope chain length instrumentation: + At compile time, rt->hostenvScopeDepthStats and rt->lexicalScopeDepthStats meter scope chains passed into the compile and evaluate APIs. + At runtime, rt->protoLookupDepthStats and rt->scopeSearchDepthStats track steps along the prototype and scope chains until the sought-after property is found. * JS_ARENAMETER uses JSBasicStats now. * Added rt->liveScopePropsPreSweep to fix the property tree stats code that rotted when property tree sweeping moved to after the finalization phase. * Un-bitrotted some DEBUG_brendan code, turned some off for myself via XXX. * Mac OS X toolchain requires initialized data shared across dynamic library member files, outlaws common data, so initialize extern metering vars. * Old HASHMETER code in jshash.[ch] is now JS_HASHMETER-controlled and based on JSBasicStats. * DEBUG_scopemeters macro renamed JS_DUMP_SCOPE_METERS; uses JSBasicStats now. * Disentangle DEBUG and DUMP_SCOPE_STATS (now JS_DUMP_PROPTREE_STATS) and fix inconsistent thread safety for liveScopeProps (sometimes atomic-incremented, sometimes runtime-locked). * Compiler-modeled maxScopeDepth will propagate via JSScript to runtime for capability-based, interpreter-inlined cache hit qualifier bits, to bypass scope and prototype chain lookup by optimizing for common monomorphic get, set, and call site referencing a prototype property in a well-named object (no shadowing or mutation in 99.9% of the cases).
2008-01-12 16:31:31 -08:00
|
|
|
#ifdef JS_HASHMETER
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashTableDumpMeter(ht, dump, fp);
|
|
|
|
#endif
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
JSHashNumber
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_HashString(const void *key)
|
|
|
|
{
|
|
|
|
JSHashNumber h;
|
|
|
|
const unsigned char *s;
|
|
|
|
|
|
|
|
h = 0;
|
|
|
|
for (s = (const unsigned char *)key; *s; s++)
|
2008-01-29 18:36:33 -08:00
|
|
|
h = JS_ROTATE_LEFT32(h, 4) ^ *s;
|
2007-03-22 10:30:00 -07:00
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2012-07-18 17:38:10 -07:00
|
|
|
int
|
2007-03-22 10:30:00 -07:00
|
|
|
JS_CompareValues(const void *v1, const void *v2)
|
|
|
|
{
|
|
|
|
return v1 == v2;
|
|
|
|
}
|