diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2011-01-26 00:50:30 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2011-01-26 00:50:30 +0300 |
| commit | 64b0cc8703122437fb46e890ea0c0b4fda1d77da (patch) | |
| tree | c6a29f38bb442474ab8af80894cfce0b499fc023 /accel-pppd/radius | |
| parent | 2742af0f2760b7b8d326aa4112aac14b453e3bbb (diff) | |
| download | accel-ppp-64b0cc8703122437fb46e890ea0c0b4fda1d77da.tar.gz accel-ppp-64b0cc8703122437fb46e890ea0c0b4fda1d77da.zip | |
futher memory usage optimization
Diffstat (limited to 'accel-pppd/radius')
| -rw-r--r-- | accel-pppd/radius/packet.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/accel-pppd/radius/packet.c b/accel-pppd/radius/packet.c index e8d2af93..dc355d55 100644 --- a/accel-pppd/radius/packet.c +++ b/accel-pppd/radius/packet.c @@ -17,6 +17,7 @@ static mempool_t packet_pool; static mempool_t attr_pool; +static mempool_t buf_pool; struct rad_packet_t *rad_packet_alloc(int code) { @@ -51,9 +52,11 @@ int rad_packet_build(struct rad_packet_t *pack, uint8_t *RA) uint8_t *ptr; if (!pack->buf) { - ptr = mmap(NULL, REQ_LENGTH_MAX, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); + //ptr = mmap(NULL, REQ_LENGTH_MAX, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); + ptr = mempool_alloc(buf_pool); - if (ptr == MAP_FAILED) { + //if (ptr == MAP_FAILED) { + if (!ptr) { log_emerg("radius:packet: out of memory\n"); return -1; } @@ -116,7 +119,8 @@ int rad_packet_recv(int fd, struct rad_packet_t **p, struct sockaddr_in *addr) if (!pack) return 0; - ptr = mmap(NULL, REQ_LENGTH_MAX, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); + //ptr = mmap(NULL, REQ_LENGTH_MAX, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); + ptr = mempool_alloc(buf_pool); if (ptr == MAP_FAILED) { log_emerg("radius:packet: out of memory\n"); goto out_err; @@ -241,7 +245,8 @@ void rad_packet_free(struct rad_packet_t *pack) struct rad_attr_t *attr; if (pack->buf) - munmap(pack->buf, REQ_LENGTH_MAX); + mempool_free(pack->buf); + //munmap(pack->buf, REQ_LENGTH_MAX); while(!list_empty(&pack->attrs)) { attr = list_entry(pack->attrs.next, typeof(*attr), entry); @@ -644,4 +649,5 @@ static void __init init(void) { attr_pool = mempool_create(sizeof(struct rad_attr_t)); packet_pool = mempool_create(sizeof(struct rad_packet_t)); + buf_pool = mempool_create(REQ_LENGTH_MAX); } |