X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=libwinnie%2Fsrc%2Fshalloc.cc;h=1bb7db25b5e7e4f99b7db19ded7c01b8d9639098;hb=c71a62d30b70fa37a6ab6b03f7cfc34e29530e80;hp=5d4715aca907615471962c1e4b0e2a7f43af48be;hpb=7b5d2df884abb7084d71f17cc29a618c0b6f47ef;p=winnie

diff --git a/libwinnie/src/shalloc.cc b/libwinnie/src/shalloc.cc
index 5d4715a..1bb7db2 100644
--- a/libwinnie/src/shalloc.cc
+++ b/libwinnie/src/shalloc.cc
@@ -21,8 +21,8 @@ Author: Eleni Maria Stea <elene.mst@gmail.com>
 
 #include <assert.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <errno.h>
@@ -35,9 +35,6 @@ Author: Eleni Maria Stea <elene.mst@gmail.com>
 
 #include "shalloc.h"
 
-#define SHMNAME	"/winnie.shm"
-
-#define POOL_SIZE 16777216
 #define BLOCK_SIZE 512
 
 #define NUM_BLOCKS (POOL_SIZE / BLOCK_SIZE)
@@ -80,8 +77,6 @@ bool init_shared_memory()
 		fprintf(stderr, "Failed to map shared memory: %s\n", strerror(errno));
 	}
 
-	shm_unlink(SHMNAME);
-
 	for(int i=0; i<BITMAP_SIZE; i++) {
 		bitmap[i] = 0;
 	}
@@ -98,6 +93,7 @@ void destroy_shared_memory()
 	if(munmap(pool, POOL_SIZE) == -1) {
 		fprintf(stderr, "Failed to unmap shared memory: %s\n", strerror(errno));
 	}
+	shm_unlink(SHMNAME);
 }
 
 void *sh_malloc(size_t bytes)