X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fq.c;h=fa28bda05d100e6f7b78afbec624e9d88c4cb222;hb=210871fb25129505f89062549560543181f9f2f2;hp=2f4637394479d6a2d30b9f05dffdc7cdaf032d14;hpb=14267197e47b28a7f504c39f916f21d702fdabf5;p=swftools.git

diff --git a/lib/q.c b/lib/q.c
index 2f46373..fa28bda 100644
--- a/lib/q.c
+++ b/lib/q.c
@@ -4,9 +4,9 @@
    
    Copyright (c) 2001,2002,2003,2004 Matthias Kramm <kramm@quiss.org>
  
-   This program is free software; you can redistribute it and/or modify
+   This program is rfx_free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the rfx_free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -15,14 +15,16 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
+   along with this program; if not, write to the rfx_free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 #include <memory.h>
+#include "mem.h"
 #include "q.h"
 
 // ------------------------------- malloc, alloc routines ---------------------
@@ -30,7 +32,7 @@
 #ifndef STRNDUP
 char* strdup_n(const char*str, int size)
 {
-    char*m = (char*)malloc(size+1);
+    char*m = (char*)rfx_alloc(size+1);
     memcpy(m, str, size);
     m[size] = 0;
     return m;
@@ -53,27 +55,22 @@ void mem_init(mem_t*mem)
 }
 void mem_clear(mem_t*mem)
 {
-    free(mem->buffer);mem->buffer = 0;
+    rfx_free(mem->buffer);mem->buffer = 0;
 }
 void mem_destroy(mem_t*mem)
 {
     mem_clear(mem);
-    free(mem);
+    rfx_free(mem);
 }
-static int mem_put_(mem_t*m,void*data, int length, int null)
+static int mem_put_(mem_t*m,const void*data, int length, int null)
 {
     int n = m->pos;
     m->pos += length + (null?1:0);
-    if(m->pos > m->len)
-    { 
-	//m->len += 1024>length?1024:(null?length*2:length);
-
-	m->len *= 2;
-	while(m->len < m->pos)
-	    m->len += 64;
-
-	m->buffer = m->buffer?(char*)realloc(m->buffer,m->len):(char*)malloc(m->len);
+    if(m->pos > m->len) { 
+        m->len = (m->pos+63)&~63;
+	m->buffer = m->buffer?(char*)rfx_realloc(m->buffer,m->len):(char*)rfx_alloc(m->len);
     }
+    assert(n+length <= m->len);
     memcpy(&m->buffer[n], data, length);
     if(null)
 	m->buffer[n + length] = 0;
@@ -100,11 +97,10 @@ typedef struct _ringbuffer_internal_t
 
 void ringbuffer_init(ringbuffer_t*r)
 {
-    ringbuffer_internal_t*i = (ringbuffer_internal_t*)malloc(sizeof(ringbuffer_internal_t)); 
+    ringbuffer_internal_t*i = (ringbuffer_internal_t*)rfx_calloc(sizeof(ringbuffer_internal_t)); 
     memset(r, 0, sizeof(ringbuffer_t));
-    memset(i, 0, sizeof(ringbuffer_internal_t));
     r->internal = i;
-    i->buffer = (unsigned char*)malloc(1024);
+    i->buffer = (unsigned char*)rfx_alloc(1024);
     i->buffersize = 1024;
 }
 int ringbuffer_read(ringbuffer_t*r, void*buf, int len)
@@ -143,9 +139,9 @@ void ringbuffer_put(ringbuffer_t*r, void*buf, int len)
 	if(newbuffersize < r->available + len)
 	    newbuffersize = r->available + len + 1024;
 
-	buf2 = (unsigned char*)malloc(newbuffersize);
+	buf2 = (unsigned char*)rfx_alloc(newbuffersize);
 	ringbuffer_read(r, buf2, r->available);
-	free(i->buffer);
+	rfx_free(i->buffer);
 	i->buffer = buf2;
 	i->buffersize = newbuffersize;
 	i->readpos = 0;
@@ -167,8 +163,107 @@ void ringbuffer_put(ringbuffer_t*r, void*buf, int len)
 void ringbuffer_clear(ringbuffer_t*r)
 {
     ringbuffer_internal_t*i = (ringbuffer_internal_t*)r->internal;
-    free(i->buffer);i->buffer = 0;
-    free(i);
+    rfx_free(i->buffer);i->buffer = 0;
+    rfx_free(i);
+}
+
+// ------------------------------- heap_t -------------------------------
+
+void heap_init(heap_t*h,int n,int elem_size, int(*compare)(const void *, const void *))
+{
+    memset(h, 0, sizeof(heap_t));
+    h->max_size = n;
+    h->size = 0;
+    h->elem_size = elem_size;
+    h->compare = compare;
+    h->elements = (void**)rfx_calloc(n*sizeof(void*));
+    h->data = (char*)rfx_calloc(h->max_size*h->elem_size);
+}
+void heap_clear(heap_t*h)
+{
+    rfx_free(h->elements);
+    rfx_free(h->data);
+}
+
+#define HEAP_NODE_SMALLER(h,node1,node2) ((h)->compare((node1),(node2))>0)
+
+static void up(heap_t*h, int node)
+{
+    void*node_p = h->elements[node];
+    int parent = node;
+    do {
+	node = parent;
+	if(!node) break;
+	parent = (node-1)/2;
+	h->elements[node] = h->elements[parent];
+    } while(HEAP_NODE_SMALLER(h,h->elements[parent], node_p));
+
+    h->elements[node] = node_p;
+}
+static void down(heap_t*h, int node)
+{
+    void*node_p = h->elements[node];
+    int child = node;
+    do {
+	node = child;
+
+	/* determine new child's position */
+	child = node<<1|1;
+	if(child >= h->size) 
+            break;
+        if(child+1 < h->size && HEAP_NODE_SMALLER(h,h->elements[child],h->elements[child+1])) // search for bigger child
+	    child++;
+
+	h->elements[node] = h->elements[child];
+    } while(HEAP_NODE_SMALLER(h,node_p, h->elements[child]));
+    
+    h->elements[node] = node_p;
+}
+void heap_put(heap_t*h, void*e) 
+{
+    int pos = h->size++;
+    memcpy(&h->data[pos*h->elem_size],e,h->elem_size);
+    h->elements[pos] = &h->data[pos];
+    up(h, pos);
+}
+int heap_size(heap_t*h)
+{
+    return h->size;
+}
+void* heap_max(heap_t*h)
+{
+    return h->elements[0];
+}
+void* heap_chopmax(heap_t*h)
+{
+    void*p = h->elements[0];
+    h->elements[0] = h->elements[--h->size];
+    down(h,0);
+    return p;
+}
+void heap_dump(heap_t*h, FILE*fi)
+{
+    int t;
+    for(t=0;t<h->size;t++) {
+	int s;
+	for(s=0;s<=t;s=(s+1)*2-1) {
+	    if(s==t) fprintf(fi,"\n");
+	}
+	//fprintf(fi,"%d ", h->elements[t]->x); //?
+    }
+}
+void** heap_flatten(heap_t*h)
+{
+    void**nodes = (void**)rfx_alloc(h->size*sizeof(void*));
+    void**p = nodes;
+   
+    while(h->size) {
+	/*printf("Heap Size: %d\n", h->size);
+	heap_print(stdout, h);
+	printf("\n");*/
+	*p++ = heap_chopmax(h);
+    }
+    return nodes;
 }
 
 // ------------------------------- crc32 --------------------------------------
@@ -178,7 +273,7 @@ static void crc32_init(void)
     int t;
     if(crc32) 
         return;
-    crc32= (unsigned int*)malloc(sizeof(unsigned int)*256);
+    crc32= (unsigned int*)rfx_alloc(sizeof(unsigned int)*256);
     for(t=0; t<256; t++) {
         unsigned int c = t;
         int s;
@@ -190,26 +285,64 @@ static void crc32_init(void)
 }
 // ------------------------------- string_t -----------------------------------
 
-void string_set2(string_t*str, char*text, int len)
+void string_set2(string_t*str, const char*text, int len)
 {
     str->len = len;
     str->str = text;
 }
-void string_set(string_t*str, char*text)
+void string_set(string_t*str, const char*text)
 {
     str->len = strlen(text);
     str->str = text;
 }
+string_t string_new(const char*text, int len)
+{
+    string_t s;
+    s.len = len;
+    s.str = text;
+    return s;
+}
+string_t string_new2(const char*text)
+{
+    string_t s;
+    s.len = strlen(text);
+    s.str = text;
+    return s;
+}
+char* string_cstr(string_t*str)
+{
+    return strdup_n(str->str, str->len);
+}
 unsigned int string_hash(string_t*str)
 {
     int t;
     unsigned int checksum = 0;
-    crc32_init();
+    if(!crc32)
+        crc32_init();
     for(t=0;t<str->len;t++) {
         checksum = checksum>>8 ^ crc32[(str->str[t]^checksum)&0xff];
     }
     return checksum;
 }
+unsigned int string_hash2(const char*str)
+{
+    unsigned int checksum = 0;
+    const char*p = str;
+    if(!crc32)
+        crc32_init();
+    while(*p) {
+        checksum = checksum>>8 ^ crc32[(*p^checksum)&0xff];
+        p++;
+    }
+    return checksum;
+}
+unsigned int string_hash3(const char*str, int len)
+{
+    string_t s;
+    s.str = str;
+    s.len = len;
+    return string_hash(&s);
+}
 void string_dup2(string_t*str, const char*text, int len)
 {
     str->len = len;
@@ -233,15 +366,9 @@ int string_equals2(string_t*str, string_t*str2)
 	return 1;
     return 0;
 }
-char* string_cstr(string_t*str)
-{
-    return strdup_n(str->str, str->len);
-}
 
 // ------------------------------- stringarray_t ------------------------------
 
-#define DEFAULT_HASH_SIZE 257
-
 typedef struct _stringlist {
     int index;
     struct _stringlist*next;
@@ -249,7 +376,6 @@ typedef struct _stringlist {
 
 typedef struct _stringarray_internal_t
 {
-    mem_t data;
     mem_t pos;
     stringlist_t**hash;
     int num;
@@ -260,13 +386,10 @@ void stringarray_init(stringarray_t*sa, int hashsize)
 {
     stringarray_internal_t*s;
     int t;
-    sa->internal = (stringarray_internal_t*)malloc(sizeof(stringarray_internal_t)); 
-    memset(sa->internal, 0, sizeof(stringarray_internal_t));
+    sa->internal = (stringarray_internal_t*)rfx_calloc(sizeof(stringarray_internal_t)); 
     s = (stringarray_internal_t*)sa->internal;
-    mem_init(&s->data);
     mem_init(&s->pos);
-    s->hash = malloc(sizeof(stringlist_t*)*hashsize);
-    memset(s->hash, 0, sizeof(stringlist_t*)*hashsize);
+    s->hash = rfx_calloc(sizeof(stringlist_t*)*hashsize);
     s->hashsize = hashsize;
 }
 void stringarray_put(stringarray_t*sa, string_t str)
@@ -274,10 +397,11 @@ void stringarray_put(stringarray_t*sa, string_t str)
     stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
     int pos;
     int hash = string_hash(&str) % s->hashsize;
-    pos = mem_putstring(&s->data, str);
-    mem_put(&s->pos, &pos, sizeof(int));
 
-    stringlist_t*l = malloc(sizeof(stringlist_t));
+    char*ss = string_cstr(&str);
+    mem_put(&s->pos, &ss, sizeof(char*));
+
+    stringlist_t*l = rfx_alloc(sizeof(stringlist_t));
     l->index = s->num;
     l->next = s->hash[hash];
     s->hash[hash] = l;
@@ -287,13 +411,13 @@ void stringarray_put(stringarray_t*sa, string_t str)
 char* stringarray_at(stringarray_t*sa, int pos)
 {
     stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
-    int p;
+    char*p;
     if(pos<0 || pos>=s->num)
 	return 0;
-    p = *(int*)&s->pos.buffer[pos*sizeof(int)];
+    p = *(char**)&s->pos.buffer[pos*sizeof(char*)];
     if(p<0)
 	return 0;
-    return &s->data.buffer[p];
+    return p;
 }
 string_t stringarray_at2(stringarray_t*sa, int pos)
 {
@@ -310,7 +434,7 @@ static stringlist_t* stringlist_del(stringarray_t*sa, stringlist_t*l, int index)
         if(index==l->index) {
             old->next = l->next;
             memset(l, 0, sizeof(stringlist_t));
-            free(l);
+            rfx_free(l);
             if(old==l)
                 return 0;
             else
@@ -329,7 +453,7 @@ void stringarray_del(stringarray_t*sa, int pos)
     string_t str = stringarray_at2(sa, pos);
     int hash = string_hash(&str) % s->hashsize;
     s->hash[hash] = stringlist_del(sa, s->hash[hash], pos);
-    *(int*)&s->pos.buffer[pos*sizeof(int)] = -1;
+    *(char**)&s->pos.buffer[pos*sizeof(char*)] = 0;
 }
 int stringarray_find(stringarray_t*sa, string_t* str)
 {
@@ -337,6 +461,7 @@ int stringarray_find(stringarray_t*sa, string_t* str)
     int hash = string_hash(str) % s->hashsize;
     int t;
     stringlist_t*l = s->hash[hash];
+    //TODO: statistics
     while(l) {
         string_t s = stringarray_at2(sa, l->index);
         if(string_equals2(str, &s)) {
@@ -349,7 +474,6 @@ int stringarray_find(stringarray_t*sa, string_t* str)
 void stringarray_clear(stringarray_t*sa)
 {
     stringarray_internal_t*s = (stringarray_internal_t*)sa->internal;
-    mem_clear(&s->data);
     mem_clear(&s->pos);
     int t;
     for(t=0;t<s->hashsize;t++) {
@@ -357,284 +481,268 @@ void stringarray_clear(stringarray_t*sa)
         while(l) {
             stringlist_t*next = l->next;
             memset(l, 0, sizeof(stringlist_t));
-            free(l);
+            rfx_free(l);
             l = next;
         }
     }
-    free(s);
+    rfx_free(s->hash);s->hash=0;
+    rfx_free(s);
 }
 void stringarray_destroy(stringarray_t*sa)
 {
     stringarray_clear(sa);
-    free(sa);
+    rfx_free(sa);
 }
 
 
-// ------------------------------- map_t --------------------------------------
+// ------------------------------- dictionary_t -------------------------------
 
-typedef struct _map_internal_t
-{
-    stringarray_t keys;
-    stringarray_t values;
-    int num;
-} map_internal_t;
+#define INITIAL_SIZE 63
 
-void map_init(map_t*map)
+dict_t*dict_new()
 {
-    map_internal_t*m;
-    map->internal = (map_internal_t*)malloc(sizeof(map_internal_t));
-    memset(map->internal, 0, sizeof(map_internal_t));
-    m = (map_internal_t*)map->internal;
-    stringarray_init(&m->keys, DEFAULT_HASH_SIZE);
-    stringarray_init(&m->values, DEFAULT_HASH_SIZE);
+    dict_t*d = rfx_alloc(sizeof(dict_t));
+    dict_init(d);
+    return d;
 }
-void map_put(map_t*map, string_t t1, string_t t2)
+void dict_init(dict_t*h) 
 {
-    map_internal_t*m = (map_internal_t*)map->internal;
-    stringarray_put(&m->keys, t1);
-    stringarray_put(&m->values, t2);
-    m->num++;
+    memset(h, 0, sizeof(dict_t));
+    h->hashsize = INITIAL_SIZE;
+    h->slots = h->hashsize?(dictentry_t**)rfx_calloc(sizeof(dictentry_t*)*h->hashsize):0;
+    h->num = 0;
 }
-char* map_lookup(map_t*map, const char*name)
+static void dict_expand(dict_t*h, int newlen)
 {
-    int s;
-    map_internal_t*m = (map_internal_t*)map->internal;
-    string_t str;
-    string_set(&str, (char*)name);
-    s = stringarray_find(&m->keys, &str);
-    if(s>=0) {
-	string_t s2 = stringarray_at2(&m->values, s);
-	return s2.str;
-    }
-    return 0;
-}
-void map_dump(map_t*map, FILE*fi, const char*prefix)
-{
-    int t;
-    map_internal_t*m = (map_internal_t*)map->internal;
-    for(t=0;t<m->num;t++) {
-	string_t s1 = stringarray_at2(&m->keys, t);
-	string_t s2 = stringarray_at2(&m->values, t);
-	fprintf(fi, "%s%s=%s\n", prefix, s1.str, s2.str);
+    assert(h->hashsize < newlen);
+    dictentry_t**newslots = (dictentry_t**)rfx_calloc(sizeof(dictentry_t*)*newlen);
+    int t; 
+    for(t=0;t<h->hashsize;t++) {
+        dictentry_t*e = h->slots[t];
+        while(e) {
+            dictentry_t*next = e->next;
+            unsigned int newhash = e->hash%newlen;
+            e->next = newslots[newhash];
+            newslots[newhash] = e;
+            e = next;
+        }
     }
+    if(h->slots)
+        rfx_free(h->slots);
+    h->slots = newslots;
+    h->hashsize = newlen;
 }
-void map_clear(map_t*map)
+void dict_put(dict_t*h, string_t s, void* data)
 {
-    map_internal_t*m = (map_internal_t*)map->internal;
-    stringarray_clear(&m->keys);
-    stringarray_clear(&m->values);
-    free(m);
+    unsigned int hash = string_hash(&s);
+    dictentry_t*e = (dictentry_t*)rfx_alloc(sizeof(dictentry_t));
+
+    unsigned int hash2 = string_hash(&s) % h->hashsize;
+    char*sdata = rfx_alloc(s.len);
+    memcpy(sdata, s.str, s.len);
+    e->s = sdata;
+    e->len = s.len;
+    e->hash = hash; //for resizing
+    e->next = h->slots[hash2];
+    e->data = data;
+    h->slots[hash2] = e;
+    h->num++;
 }
-void map_destroy(map_t*map)
+void dict_put2(dict_t*h, const char*s, void*data) 
 {
-    map_clear(map);
-    free(map);
+    string_t s2;
+    string_set(&s2, s);
+    dict_put(h, s2, data);
 }
-
-// ------------------------------- dictionary_t -------------------------------
-
-typedef struct _dictionary_internal_t
-{
-    stringarray_t keys;
-    mem_t values;
-    int num;
-} dictionary_internal_t;
-
-void dictionary_init(dictionary_t*dict)
+void dict_put3(dict_t*h, const char* s, int len, void*data)
 {
-    dictionary_internal_t*d;
-    dict->internal = (dictionary_internal_t*)malloc(sizeof(dictionary_internal_t));
-    memset(dict->internal, 0, sizeof(dictionary_internal_t));
-    d = (dictionary_internal_t*)dict->internal;
-    stringarray_init(&d->keys, DEFAULT_HASH_SIZE);
-    mem_init(&d->values);
+    string_t s3;
+    string_set2(&s3, s, len);
+    dict_put(h, s3, data);
 }
-void dictionary_put(dictionary_t*dict, string_t t1, void* t2)
+void dict_dump(dict_t*h, FILE*fi, const char*prefix)
 {
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    int s=0;
-    s = stringarray_find(&d->keys, &t1);
-    if(s>=0) {
-	/* replace */
-	*(void**)(&d->values.buffer[s*sizeof(void*)]) = t2;
-    } else {
-	stringarray_put(&d->keys, t1);
-	mem_put(&d->values, &t2, sizeof(void*));
-	d->num++;
+    int t;
+    for(t=0;t<h->hashsize;t++) {
+        dictentry_t*e = h->slots[t];
+        while(e) {
+            char*s = strdup_n(e->s, e->len);
+            fprintf(fi, "%s%s=%08x\n", prefix, e->s, e->data);
+            rfx_free(s);
+            e = e->next;
+        }
     }
 }
-void dictionary_put2(dictionary_t*dict, const char*t1, void* t2)
+int dict_count(dict_t*h)
 {
-    string_t s;
-    string_set(&s, (char*)t1);
-    dictionary_put(dict, s, t2);
-}
-stringarray_t* dictionary_index(dictionary_t*dict)
-{
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    return &d->keys;
+    return h->num;
 }
-int dictionary_count(dictionary_t* dict) // this count includes entries that have been deleted
+void* dict_lookup2(dict_t*h, const char*s, int len)
 {
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    return d->num;
+    if(!h->num)
+        return 0;
+
+    if(h->num*3 >= h->hashsize*2) {
+        /* if dict is 2/3 filled, double the size */
+        dict_expand(h, (h->hashsize+1)*2-1);
+    }
+
+    unsigned int ohash = string_hash2(s);
+    unsigned int hash = ohash % h->hashsize;
+
+    dictentry_t*e = h->slots[hash];
+    while(e) {
+        if(e->len == len && !memcmp(e->s, s, len)) {
+            return e->data;
+        }
+        e = e->next;
+    }
+    return 0;
 }
-void* dictionary_lookup(dictionary_t*dict, const char*name)
-{
-    int s;
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    string_t str;
-    string_set(&str, (char*)name);
-    s = stringarray_find(&d->keys, &str);
-    if(s>=0) {
-	return *(void**)&d->values.buffer[sizeof(void*)*s];
+void* dict_lookup(dict_t*h, const char*s)
+{
+    int l = strlen(s);
+    return dict_lookup2(h, s, l);
+}
+char dict_del(dict_t*h, const char*s)
+{
+    if(!h->num)
+        return 0;
+    unsigned int hash = string_hash2(s) % h->hashsize;
+    int l = strlen(s);
+    dictentry_t*head = h->slots[hash];
+    dictentry_t*e = head, *prev=0;
+    while(e) {
+        if(e->len ==l && !memcmp(e->s, s, l)) {
+            dictentry_t*next = e->next;
+            rfx_free((void*)e->s);
+            memset(e, 0, sizeof(dictentry_t));
+            rfx_free(e);
+            if(e == head) {
+                h->slots[hash] = 0;
+            } else {
+                assert(prev);
+                prev->next = next;
+            }
+            h->num--;
+            return 1;
+        }
+        prev = e;
+        e = e->next;
     }
     return 0;
 }
-void dictionary_dump(dictionary_t*dict, FILE*fi, const char*prefix)
+void dict_foreach_keyvalue(dict_t*h, void (*runFunction)(void*data, const char*key, void*val), void*data)
 {
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
     int t;
-    for(t=0;t<d->num;t++) {
-	string_t s1 = stringarray_at2(&d->keys, t);
-	fprintf(fi, "%s%s=%08x\n", prefix, s1.str, *(void**)&d->values.buffer[sizeof(void*)*t]);
+    for(t=0;t<h->hashsize;t++) {
+        dictentry_t*e = h->slots[t];
+        while(e) {
+            dictentry_t*next = e->next;
+            if(runFunction) {
+                char*s = strdup_n(e->s, e->len); //append \0
+                runFunction(data, s, e->data);
+                rfx_free(s);
+            }
+            e = e->next;
+        }
     }
 }
-void dictionary_del(dictionary_t*dict, const char* name)
+void dict_foreach_value(dict_t*h, void (*runFunction)(void*))
 {
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    int s;
-    string_t str;
-    string_set(&str, (char*)name);
-    s = stringarray_find(&d->keys, &str);
-    if(s>=0) {
-	*(void**)(&d->values.buffer[s*sizeof(void*)]) = 0;
-	stringarray_del(&d->keys, s);
+    int t;
+    for(t=0;t<h->hashsize;t++) {
+        dictentry_t*e = h->slots[t];
+        while(e) {
+            dictentry_t*next = e->next;
+            if(runFunction) {
+                runFunction(e->data);
+            }
+            e = e->next;
+        }
     }
 }
-void dictionary_clear(dictionary_t*dict)
-{
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    stringarray_clear(&d->keys);
-    mem_clear(&d->values);
-    free(d);
-}
-void dictionary_destroy(dictionary_t*dict)
+void dict_free_all(dict_t*h, void (*freeFunction)(void*))
 {
-    dictionary_clear(dict);
-    free(dict);
-}
-
-void dictionary_free_all(dictionary_t* dict, void (*freeFunction)(void*))
-{
-    dictionary_internal_t*d = (dictionary_internal_t*)dict->internal;
-    int num = 0;
-    char* name = stringarray_at(&d->keys, num)    ;
-    while (name)
-    {
-        freeFunction(dictionary_lookup(dict, name));
-        num++;
-        name = stringarray_at(&d->keys, num);
+    int t;
+    for(t=0;t<h->hashsize;t++) {
+        dictentry_t*e = h->slots[t];
+        while(e) {
+            dictentry_t*next = e->next;
+            rfx_free((void*)e->s);
+            if(freeFunction) {
+                freeFunction(e->data);
+            }
+            memset(e, 0, sizeof(dictentry_t));
+            rfx_free(e);
+            e = next;
+        }
     }
-    dictionary_clear(dict);
+    rfx_free(h->slots);
+    memset(h, 0, sizeof(dict_t));
 }
-
-// ------------------------------- heap_t -------------------------------
-
-void heap_init(heap_t*h,int n,int elem_size, int(*compare)(const void *, const void *))
+void dict_clear(dict_t*h) 
 {
-    memset(h, 0, sizeof(heap_t));
-    h->max_size = n;
-    h->size = 0;
-    h->elem_size = elem_size;
-    h->compare = compare;
-    h->elements = (void**)malloc(n*sizeof(void*));memset(h->elements, 0, n*sizeof(void*));
-    h->data = (char*)malloc(h->max_size*h->elem_size);memset(h->data, 0, h->max_size*h->elem_size);
+    dict_free_all(h, 0);
 }
-void heap_clear(heap_t*h)
+void dict_destroy(dict_t*dict)
 {
-    free(h->elements);
-    free(h->data);
+    dict_clear(dict);
+    rfx_free(dict);
 }
 
-#define HEAP_NODE_SMALLER(h,node1,node2) ((h)->compare((node1),(node2))>0)
+// ------------------------------- map_t --------------------------------------
 
-static void up(heap_t*h, int node)
+typedef struct _map_internal_t
 {
-    void*node_p = h->elements[node];
-    int parent = node;
-    do {
-	node = parent;
-	if(!node) break;
-	parent = (node-1)/2;
-	h->elements[node] = h->elements[parent];
-    } while(HEAP_NODE_SMALLER(h,h->elements[parent], node_p));
+    dict_t d;
+} map_internal_t;
 
-    h->elements[node] = node_p;
-}
-static void down(heap_t*h, int node)
+void map_init(map_t*map)
 {
-    void*node_p = h->elements[node];
-    int child = node;
-    do {
-	node = child;
-
-	/* determine new child's position */
-	child = node<<1|1;
-	if(child >= h->size) 
-            break;
-        if(child+1 < h->size && HEAP_NODE_SMALLER(h,h->elements[child],h->elements[child+1])) // search for bigger child
-	    child++;
-
-	h->elements[node] = h->elements[child];
-    } while(HEAP_NODE_SMALLER(h,node_p, h->elements[child]));
-    
-    h->elements[node] = node_p;
+    map_internal_t*m;
+    map->internal = (map_internal_t*)rfx_calloc(sizeof(map_internal_t));
+    m = (map_internal_t*)map->internal;
+    dict_init(&m->d);
 }
-void heap_put(heap_t*h, void*e) 
+void map_put(map_t*map, string_t t1, string_t t2)
 {
-    int pos = h->size++;
-    memcpy(&h->data[pos*h->elem_size],e,h->elem_size);
-    h->elements[pos] = &h->data[pos];
-    up(h, pos);
+    map_internal_t*m = (map_internal_t*)map->internal;
+    string_t s;
+    char* s1 = string_cstr(&t1);
+    dict_put2(&m->d, s1, (void*)string_cstr(&t2));
+    rfx_free(s1);
 }
-int heap_size(heap_t*h)
+const char* map_lookup(map_t*map, const char*name)
 {
-    return h->size;
+    map_internal_t*m = (map_internal_t*)map->internal;
+    const char*value = dict_lookup(&m->d, name);
+    return value;
 }
-void* heap_max(heap_t*h)
+static void freestring(void*data)
 {
-    return h->elements[0];
+    rfx_free(data);
 }
-void* heap_chopmax(heap_t*h)
+static void dumpmapentry(void*data, const char*key, void*value)
 {
-    void*p = h->elements[0];
-    h->elements[0] = h->elements[--h->size];
-    down(h,0);
-    return p;
+    FILE*fi = (FILE*)data;
+    fprintf(fi, "%s=%s\n", key, (char*)value);
 }
-void heap_dump(heap_t*h, FILE*fi)
+void map_dump(map_t*map, FILE*fi, const char*prefix)
 {
     int t;
-    for(t=0;t<h->size;t++) {
-	int s;
-	for(s=0;s<=t;s=(s+1)*2-1) {
-	    if(s==t) fprintf(fi,"\n");
-	}
-	//fprintf(fi,"%d ", h->elements[t]->x); //?
-    }
+    map_internal_t*m = (map_internal_t*)map->internal;
+    dict_foreach_keyvalue(&m->d, dumpmapentry, fi);
 }
-void** heap_flatten(heap_t*h)
+void map_clear(map_t*map)
 {
-    void**nodes = (void**)malloc(h->size*sizeof(void*));
-    void**p = nodes;
-   
-    while(h->size) {
-	/*printf("Heap Size: %d\n", h->size);
-	heap_print(stdout, h);
-	printf("\n");*/
-	*p++ = heap_chopmax(h);
-    }
-    return nodes;
+    map_internal_t*m = (map_internal_t*)map->internal;
+    dict_free_all(&m->d, freestring);
+    rfx_free(m);
+}
+void map_destroy(map_t*map)
+{
+    map_clear(map);
+    rfx_free(map);
 }