Changeset 0f15f12

Timestamp:

Aug 20, 2009, 9:19:01 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f278ff3

Parents:

5ebc202

git-author:

Anders Kaseorg <andersk@mit.edu> (08/20/09 21:14:37)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/20/09 21:19:01)

Message:

owl_list_grow, owl_dict_insert_element: Don’t use fuzzy math.

• Make sure to allocate at least as many elements as were requested.
• Don’t use floating point math to compute the expansion amount.
• In owl_dict_insert_element, reallocate using the right element size
  instead of relying on the GROWAT fudge factor (WTF?).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• dict.c (modified) (2 diffs)
• list.c (modified) (2 diffs)

dict.c

@@ -13 +13 @@
 
 #define INITSIZE 30
-#define GROWAT 2
-#define GROWBY 1.5
+#define GROWBY 3 / 2
 
 int owl_dict_create(owl_dict *d) {
@@ -93 +92 @@
     return(-2);
   } else {
-    if ((d->size+1) > (d->avail/GROWAT)) {
-      d->els=owl_realloc(d->els, d->avail*GROWBY*sizeof(void *));
-      d->avail=d->avail*GROWBY;
+    if (d->size + 1 > d->avail) {
+      int avail = MAX(d->avail * GROWBY, d->size + 1);
+      d->els = owl_realloc(d->els, avail * sizeof(owl_dict_el));
+      d->avail = avail;
       if (d->els==NULL) return(-1);
     }

list.c

@@ -3 +3 @@
 
 #define INITSIZE 10
-#define GROWBY 1.5
+#define GROWBY 3 / 2
 
 int owl_list_create(owl_list *l)
@@ -25 +25 @@
 
   if ((l->size+n) > l->avail) {
-    ptr=owl_realloc(l->list, l->avail*GROWBY*sizeof(void *));
+    int avail = MAX(l->avail * GROWBY, l->size + n);
+    ptr = owl_realloc(l->list, avail * sizeof(void *));
     if (ptr==NULL) abort();
     l->list=ptr;
-    l->avail=l->avail*GROWBY;
+    l->avail = avail;
   }