summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1998-12-06 12:59:18 +0100
committerMartin Mares <mj@ucw.cz>1998-12-06 12:59:18 +0100
commitb35d72ac668c52ef0755cedba89bdca54bd995ac (patch)
treed968e72890f19ff3d2986c318787bd697e257a31 /lib
parent2d9290e973b9cfc909057a0409152e020d1c29db (diff)
downloadbird-b35d72ac668c52ef0755cedba89bdca54bd995ac.tar
bird-b35d72ac668c52ef0755cedba89bdca54bd995ac.zip
Name cleanups as suggested by Pavel:
- cfg_strcpy() -> cfg_strdup() - mempool -> linpool, mp_* -> lp_* [to avoid confusion with memblock, mb_*] Anyway, it might be better to stop ranting about names and do some *real* work.
Diffstat (limited to 'lib')
-rw-r--r--lib/mempool.c56
-rw-r--r--lib/resource.h10
2 files changed, 33 insertions, 33 deletions
diff --git a/lib/mempool.c b/lib/mempool.c
index 8bf428e..f3b84a5 100644
--- a/lib/mempool.c
+++ b/lib/mempool.c
@@ -12,32 +12,32 @@
#include "nest/bird.h"
#include "lib/resource.h"
-struct mp_chunk {
- struct mp_chunk *next;
+struct lp_chunk {
+ struct lp_chunk *next;
byte data[0];
};
-struct mempool {
+struct linpool {
resource r;
byte *ptr, *end;
- struct mp_chunk *first, **plast;
+ struct lp_chunk *first, **plast;
unsigned chunk_size, threshold, total;
};
-void mp_free(resource *);
-void mp_dump(resource *);
+void lp_free(resource *);
+void lp_dump(resource *);
-static struct resclass mp_class = {
- "MemPool",
- sizeof(struct mempool),
- mp_free,
- mp_dump
+static struct resclass lp_class = {
+ "LinPool",
+ sizeof(struct linpool),
+ lp_free,
+ lp_dump
};
-mempool
-*mp_new(pool *p, unsigned blk)
+linpool
+*lp_new(pool *p, unsigned blk)
{
- mempool *m = ralloc(p, &mp_class);
+ linpool *m = ralloc(p, &lp_class);
m->ptr = m->end = NULL;
m->first = NULL;
m->plast = &m->first;
@@ -48,7 +48,7 @@ mempool
}
void *
-mp_alloc(mempool *m, unsigned size)
+lp_alloc(linpool *m, unsigned size)
{
byte *a = (byte *) ALIGN((unsigned long) m->ptr, CPU_STRUCT_ALIGN);
byte *e = a + size;
@@ -60,15 +60,15 @@ mp_alloc(mempool *m, unsigned size)
}
else
{
- struct mp_chunk *c;
+ struct lp_chunk *c;
if (size >= m->threshold)
{
- c = xmalloc(sizeof(struct mp_chunk) + size);
+ c = xmalloc(sizeof(struct lp_chunk) + size);
m->total += size;
}
else
{
- c = xmalloc(sizeof(struct mp_chunk) + m->chunk_size);
+ c = xmalloc(sizeof(struct lp_chunk) + m->chunk_size);
m->ptr = c->data + size;
m->end = c->data + m->chunk_size;
m->total += m->chunk_size;
@@ -81,7 +81,7 @@ mp_alloc(mempool *m, unsigned size)
}
void *
-mp_allocu(mempool *m, unsigned size)
+lp_allocu(linpool *m, unsigned size)
{
byte *a = m->ptr;
byte *e = a + size;
@@ -91,23 +91,23 @@ mp_allocu(mempool *m, unsigned size)
m->ptr = e;
return a;
}
- return mp_alloc(m, size);
+ return lp_alloc(m, size);
}
void *
-mp_allocz(mempool *m, unsigned size)
+lp_allocz(linpool *m, unsigned size)
{
- void *z = mp_alloc(m, size);
+ void *z = lp_alloc(m, size);
bzero(z, size);
return z;
}
void
-mp_free(resource *r)
+lp_free(resource *r)
{
- mempool *m = (mempool *) r;
- struct mp_chunk *c, *d;
+ linpool *m = (linpool *) r;
+ struct lp_chunk *c, *d;
for(d=m->first; d; d = c)
{
@@ -117,10 +117,10 @@ mp_free(resource *r)
}
void
-mp_dump(resource *r)
+lp_dump(resource *r)
{
- mempool *m = (mempool *) r;
- struct mp_chunk *c;
+ linpool *m = (linpool *) r;
+ struct lp_chunk *c;
int cnt;
for(cnt=0, c=m->first; c; c=c->next, cnt++)
diff --git a/lib/resource.h b/lib/resource.h
index b7f18b0..6a50c33 100644
--- a/lib/resource.h
+++ b/lib/resource.h
@@ -47,12 +47,12 @@ void mb_free(void *);
/* Memory pools with linear allocation */
-typedef struct mempool mempool;
+typedef struct linpool linpool;
-mempool *mp_new(pool *, unsigned blk);
-void *mp_alloc(mempool *, unsigned size); /* Aligned */
-void *mp_allocu(mempool *, unsigned size); /* Unaligned */
-void *mp_allocz(mempool *, unsigned size); /* With clear */
+linpool *lp_new(pool *, unsigned blk);
+void *lp_alloc(linpool *, unsigned size); /* Aligned */
+void *lp_allocu(linpool *, unsigned size); /* Unaligned */
+void *lp_allocz(linpool *, unsigned size); /* With clear */
/* Slabs */