You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2012/01/30 08:06:09 UTC
svn commit: r1237546 - in /apr/apr/branches/1.5.x: ./ tables/apr_hash.c
test/testhash.c
Author: bojan
Date: Mon Jan 30 07:06:08 2012
New Revision: 1237546
URL: http://svn.apache.org/viewvc?rev=1237546&view=rev
Log:
Backport r1236970, r1237078 and r1237507 from trunk.
Randomise hashes by providing a seed (initial hash value).
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/tables/apr_hash.c
apr/apr/branches/1.5.x/test/testhash.c
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 30 07:06:08 2012
@@ -1,2 +1,2 @@
/apr/apr/branches/1.4.x:1101301
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,908427,910419,917819,917837-917838,979891,983618,990435,1055657,1072165,1078845,1183683,1183685-1183686,1183688,1183693,1183698
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,908427,910419,917819,917837-917838,979891,983618,990435,1055657,1072165,1078845,1183683,1183685-1183686,1183688,1183693,1183698,1236970,1237078,1237507
Modified: apr/apr/branches/1.5.x/tables/apr_hash.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/tables/apr_hash.c?rev=1237546&r1=1237545&r2=1237546&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/tables/apr_hash.c (original)
+++ apr/apr/branches/1.5.x/tables/apr_hash.c Mon Jan 30 07:06:08 2012
@@ -18,6 +18,7 @@
#include "apr_general.h"
#include "apr_pools.h"
+#include "apr_time.h"
#include "apr_hash.h"
@@ -78,7 +79,7 @@ struct apr_hash_t {
apr_pool_t *array_pool;
apr_hash_entry_t **array;
apr_hash_index_t iterator; /* For apr_hash_first(NULL, ...) */
- unsigned int count, max;
+ unsigned int count, max, seed;
apr_hashfunc_t hash_func;
apr_hash_entry_t *free; /* List of recycled entries */
};
@@ -99,6 +100,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_make(
{
apr_pool_t *array_pool;
apr_hash_t *ht;
+ apr_time_t now = apr_time_now();
if (apr_pool_create(&array_pool, pool) != APR_SUCCESS)
return NULL;
@@ -109,8 +111,11 @@ APR_DECLARE(apr_hash_t *) apr_hash_make(
ht->free = NULL;
ht->count = 0;
ht->max = INITIAL_MAX;
+ ht->seed = (unsigned int)((now >> 32) ^ now ^ (apr_uintptr_t)pool ^
+ (apr_uintptr_t)ht ^ (apr_uintptr_t)&now) - 1;
ht->array = alloc_array(ht, ht->max);
- ht->hash_func = apr_hashfunc_default;
+ ht->hash_func = NULL;
+
return ht;
}
@@ -196,10 +201,9 @@ static void expand_array(apr_hash_t *ht)
apr_pool_destroy(old_array_pool);
}
-APR_DECLARE_NONSTD(unsigned int) apr_hashfunc_default(const char *char_key,
- apr_ssize_t *klen)
+static unsigned int hashfunc_default(const char *char_key, apr_ssize_t *klen,
+ unsigned int hash)
{
- unsigned int hash = 0;
const unsigned char *key = (const unsigned char *)char_key;
const unsigned char *p;
apr_ssize_t i;
@@ -241,7 +245,7 @@ APR_DECLARE_NONSTD(unsigned int) apr_has
*
* -- Ralf S. Engelschall <rs...@engelschall.com>
*/
-
+
if (*klen == APR_HASH_KEY_STRING) {
for (p = key; *p; p++) {
hash = hash * 33 + *p;
@@ -257,6 +261,11 @@ APR_DECLARE_NONSTD(unsigned int) apr_has
return hash;
}
+APR_DECLARE_NONSTD(unsigned int) apr_hashfunc_default(const char *char_key,
+ apr_ssize_t *klen)
+{
+ return hashfunc_default(char_key, klen, 0);
+}
/*
* This is where we keep the details of the hash function and control
@@ -275,7 +284,10 @@ static apr_hash_entry_t **find_entry(apr
apr_hash_entry_t **hep, *he;
unsigned int hash;
- hash = ht->hash_func(key, &klen);
+ if (ht->hash_func)
+ hash = ht->hash_func(key, &klen);
+ else
+ hash = hashfunc_default(key, &klen, ht->seed);
/* scan linked list */
for (hep = &ht->array[hash & ht->max], he = *hep;
@@ -321,6 +333,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_copy(
ht->free = NULL;
ht->count = orig->count;
ht->max = orig->max;
+ ht->seed = orig->seed;
ht->hash_func = orig->hash_func;
ht->array = alloc_array(ht, ht->max);
@@ -418,7 +431,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge
apr_hash_entry_t *new_vals = NULL;
apr_hash_entry_t *iter;
apr_hash_entry_t *ent;
- unsigned int i,j,k;
+ unsigned int i, j, k, hash;
#if APR_POOL_DEBUG
/* we don't copy keys and values, so it's necessary that
@@ -450,6 +463,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge
if (base->count + overlay->count > res->max) {
res->max = res->max * 2 + 1;
}
+ res->seed = base->seed;
res->array = alloc_array(res, res->max);
if (base->count + overlay->count) {
new_vals = apr_palloc(p, sizeof(apr_hash_entry_t) *
@@ -471,7 +485,11 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge
for (k = 0; k <= overlay->max; k++) {
for (iter = overlay->array[k]; iter; iter = iter->next) {
- i = iter->hash & res->max;
+ if (res->hash_func)
+ hash = res->hash_func(iter->key, &iter->klen);
+ else
+ hash = hashfunc_default(iter->key, &iter->klen, res->seed);
+ i = hash & res->max;
for (ent = res->array[i]; ent; ent = ent->next) {
if ((ent->klen == iter->klen) &&
(memcmp(ent->key, iter->key, iter->klen) == 0)) {
@@ -489,7 +507,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge
new_vals[j].klen = iter->klen;
new_vals[j].key = iter->key;
new_vals[j].val = iter->val;
- new_vals[j].hash = iter->hash;
+ new_vals[j].hash = hash;
new_vals[j].next = res->array[i];
res->array[i] = &new_vals[j];
res->count++;
Modified: apr/apr/branches/1.5.x/test/testhash.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/test/testhash.c?rev=1237546&r1=1237545&r2=1237546&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/test/testhash.c (original)
+++ apr/apr/branches/1.5.x/test/testhash.c Mon Jan 30 07:06:08 2012
@@ -437,6 +437,79 @@ static void overlay_same(abts_case *tc,
ABTS_STR_EQUAL(tc, "#entries 5\n", StrArray[5]);
}
+static void overlay_fetch(abts_case *tc, void *data)
+{
+ apr_hash_t *base = NULL;
+ apr_hash_t *overlay = NULL;
+ apr_hash_t *result = NULL;
+ int count;
+
+ base = apr_hash_make(p);
+ overlay = apr_hash_make(p);
+ ABTS_PTR_NOTNULL(tc, base);
+ ABTS_PTR_NOTNULL(tc, overlay);
+
+ apr_hash_set(base, "base1", APR_HASH_KEY_STRING, "value1");
+ apr_hash_set(base, "base2", APR_HASH_KEY_STRING, "value2");
+ apr_hash_set(base, "base3", APR_HASH_KEY_STRING, "value3");
+ apr_hash_set(base, "base4", APR_HASH_KEY_STRING, "value4");
+ apr_hash_set(base, "base5", APR_HASH_KEY_STRING, "value5");
+
+ apr_hash_set(overlay, "overlay1", APR_HASH_KEY_STRING, "value1");
+ apr_hash_set(overlay, "overlay2", APR_HASH_KEY_STRING, "value2");
+ apr_hash_set(overlay, "overlay3", APR_HASH_KEY_STRING, "value3");
+ apr_hash_set(overlay, "overlay4", APR_HASH_KEY_STRING, "value4");
+ apr_hash_set(overlay, "overlay5", APR_HASH_KEY_STRING, "value5");
+
+ result = apr_hash_overlay(p, overlay, base);
+
+ count = apr_hash_count(result);
+ ABTS_INT_EQUAL(tc, 10, count);
+
+ ABTS_STR_EQUAL(tc, "value1",
+ apr_hash_get(result, "base1", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value2",
+ apr_hash_get(result, "base2", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value3",
+ apr_hash_get(result, "base3", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value4",
+ apr_hash_get(result, "base4", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value5",
+ apr_hash_get(result, "base5", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value1",
+ apr_hash_get(result, "overlay1", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value2",
+ apr_hash_get(result, "overlay2", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value3",
+ apr_hash_get(result, "overlay3", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value4",
+ apr_hash_get(result, "overlay4", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value5",
+ apr_hash_get(result, "overlay5", APR_HASH_KEY_STRING));
+
+ ABTS_STR_EQUAL(tc, "value1",
+ apr_hash_get(base, "base1", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value2",
+ apr_hash_get(base, "base2", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value3",
+ apr_hash_get(base, "base3", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value4",
+ apr_hash_get(base, "base4", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value5",
+ apr_hash_get(base, "base5", APR_HASH_KEY_STRING));
+
+ ABTS_STR_EQUAL(tc, "value1",
+ apr_hash_get(overlay, "overlay1", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value2",
+ apr_hash_get(overlay, "overlay2", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value3",
+ apr_hash_get(overlay, "overlay3", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value4",
+ apr_hash_get(overlay, "overlay4", APR_HASH_KEY_STRING));
+ ABTS_STR_EQUAL(tc, "value5",
+ apr_hash_get(overlay, "overlay5", APR_HASH_KEY_STRING));
+}
+
abts_suite *testhash(abts_suite *suite)
{
suite = ADD_SUITE(suite)
@@ -460,6 +533,7 @@ abts_suite *testhash(abts_suite *suite)
abts_run_test(suite, overlay_empty, NULL);
abts_run_test(suite, overlay_2unique, NULL);
abts_run_test(suite, overlay_same, NULL);
+ abts_run_test(suite, overlay_fetch, NULL);
return suite;
}