Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

shmem: fix init/destroy functions

Browse source
This commit is contained in:
Georg Reinke 2017-04-06 10:41:19 +02:00
parent 24c6493b04
commit 278a0afd45
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/nodes/shmem.c
View file

@ -59,10 +59,13 @@ int shmem_open(struct node *n) {
shm->manager = memtype_managed_init(shm->base, shm->len);
shm->shared = memory_alloc(shm->manager, sizeof(struct shmem_shared));
if (!shm->shared)
error("Shm shared struct allocation failed (not enough memory?");
queue_init(&shm->shared->in.queue, shm->insize, shm->manager);
queue_init(&shm->shared->out.queue, shm->outsize, shm->manager);
pool_init(&shm->shared->pool, shm->insize+shm->outsize, SAMPLE_LEN(shm->sample_size), shm->manager);
error("Shm shared struct allocation failed (not enough memory?)");
if (queue_init(&shm->shared->in.queue, shm->insize, shm->manager) < 0)
error("Shm queue allocation failed (not enough memory?)");
if (queue_init(&shm->shared->out.queue, shm->outsize, shm->manager) < 0)
error("Shm queue allocation failed (not enough memory?)");
if (pool_init(&shm->shared->pool, shm->insize+shm->outsize, SAMPLE_LEN(shm->sample_size), shm->manager) < 0)
error("Shm pool allocation failed (not enough memory?)");
if (shm->cond_out)
shmem_cond_init(&shm->shared->out);
if (shm->cond_in)
@ -73,6 +76,9 @@ int shmem_open(struct node *n) {
int shmem_close(struct node *n) {
struct shmem* shm = n->_vd;
queue_destroy(&shm->shared->in.queue);
queue_destroy(&shm->shared->out.queue);
pool_destroy(&shm->shared->pool);
int r = munmap(shm->base, shm->len);
if (r != 0)
return r;