Changeset 28

Timestamp:

06/10/06 22:27:11 (3 years ago)

Author:

scott

Message:

Tiny bug fix

• When apool_expand was called on a pool that currently contains items it overwrites the existing items in the stack.

Location:

trunk/libapool

Files:

• apool.c (modified) (3 diffs)
• apool.h (modified) (1 diff)
• test.c (modified) (1 diff)

trunk/libapool/apool.c

@@ -2 +2 @@
 #include <stdio.h>
 #include "apool.h"
-
-#define apool_double(pool) apool_expand(pool, pool->blocks)
 
 void apool_expand (apool *pool, size_t blocks) {
@@ -18 +16 @@
     pool->blocks += blocks;
     pool->stack = calloc(pool->blocks, sizeof(void *));
-    pool->pos += (int) blocks;
 
     /* Use the ram in reverse order */
     ram += (blocks - 1) * blocksize;
-    for (size_t i = 0; i < blocks; ram -= blocksize) {
+    for (size_t i = pool->pos; i < pool->pos + blocks; ram -= blocksize) {
         pool->stack[i++] = ram;
     }
+
+    pool->pos += (int) blocks;
 }
 
@@ -62 +61 @@
 
 void * apool_alloc (apool *pool) {
-    if (pool->pos == 0) {
-        apool_double(pool);
-    }
+    if (apool_empty(pool)) apool_double(pool);
 
     return pool->stack[--pool->pos];

trunk/libapool/apool.h

@@ -14 +14 @@
 } apool;
 
+#define apool_double(pool) apool_expand(pool, pool->blocks)
+#define apool_empty(pool) pool->pos == 0
+
 extern apool * apool_new (size_t blocks, size_t blocksize);
 extern void apool_expand (apool *pool, size_t blocks);
-extern void apool_dobule (apool *pool);
 extern void apool_destroy (apool *pool);
 extern void * apool_alloc (apool *pool);
 extern void apool_free (apool *pool, void * chunk);
-

trunk/libapool/test.c

@@ -18 +18 @@
     alist_push(list, "baz");
 
-    for (int i = 0; i < 1000; i++) {
-        alist_unshift(list, "hahah");
-        printf("%s\n", alist_pop(list));
+    for (int i = 0; i < 100000000; i++) {
+        alist_push(list, "hahah");
+        alist_shift(list);
     }