mem: fix pmap_init and change hashmap load factors to 75%

2 files changed, 4 insertions, 5 deletions

diff --git a/common.h b/common.h
index 559e685..77d24c4 100644
--- a/common.h
+++ b/common.h
@@ -265,7 +265,7 @@ void pmap_init_(struct pmapbase *, void **v, uint vsiz, uint N);
 int pmap_get_(struct pmapbase *, const void *k);
 int pmap_set_(struct pmapbase *, void **v, uint vsiz, const void *k);
 #define pmap_free(m) (free((m)->mb.k), memset((m), 0, sizeof *(m)))
-#define pmap_init(m, N) (pmap_free(m), pmap_init_(&(m)->mb, (void **)&(m)->v, sizeof*(m)->v, (N))
+#define pmap_init(m, N) (pmap_free(m), pmap_init_(&(m)->mb, (void **)&(m)->v, sizeof*(m)->v, (N)))
 #define pmap_get(m, k) (((m)->tmp = pmap_get_(&(m)->mb, k)) < 0 ? NULL : &(m)->v[(m)->tmp])
 #define pmap_set(m, k, x) ((m)->tmp = pmap_set_(&(m)->mb, (void **)&(m)->v, sizeof*(m)->v, k), \
                            (m)->v[(m)->tmp] = (x))
diff --git a/mem.c b/mem.c
index 91a726e..3efe1b6 100644
--- a/mem.c
+++ b/mem.c
@@ -221,7 +221,7 @@ imap_rehash(struct imapbase *m, void **v, uint vsiz)
 int
 imap_set_(struct imapbase *m, void **v, uint vsiz, short k)
 {
-   if (m->n >= m->N >> 1) {
+   if (m->n >= m->N/4*3 /*load factor 75*/) {
       imap_rehash(m, v, vsiz);
       assert(m->n < m->N);
    }
@@ -241,10 +241,9 @@ imap_set_(struct imapbase *m, void **v, uint vsiz, short k)
 void
 pmap_init_(struct pmapbase *m, void **v, uint vsiz, uint N)
 {
-   uint sizk = N*sizeof(int),
+   uint sizk = N*sizeof*m->k,
         sizv = N*vsiz;
 
-   assert(ispo2(N));
    m->k = xcalloc(sizk + sizv);
    *v = (char *)m->k + sizk;
    m->N = N;
@@ -297,7 +296,7 @@ pmap_rehash(struct pmapbase *m, void **v, uint vsiz)
 int pmap_set_(struct pmapbase *m, void **v, uint vsiz, const void *k)
 {
    assert(k && "null key");
-   if (m->n >= m->N >> 1) {
+   if (m->n >= m->N/4*3 /*load factor 75%*/) {
       pmap_rehash(m, v, vsiz);
       assert(m->n < m->N);
    }