devilhorns pushed a commit to branch master.

http://git.enlightenment.org/apps/express.git/commit/?id=ba17e21d9c26315d5d2af880142b3f4f9e786da9

commit ba17e21d9c26315d5d2af880142b3f4f9e786da9
Author: Christopher Michael <devilho...@comcast.net>
Date:   Fri Feb 12 14:43:30 2021 -0500

    express: Use malloc instead of mmap
---
 src/bin/grid_save.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/bin/grid_save.c b/src/bin/grid_save.c
index 198d69e..45de6de 100644
--- a/src/bin/grid_save.c
+++ b/src/bin/grid_save.c
@@ -113,16 +113,18 @@ _alloc_new(int size, unsigned char gen)
    // so allocate a new block
    sz = GS_MMAP_SIZE;
    // get mmaped anonymous memory so when freed it goes away from the system
-   ptr = mmap(NULL, sz, PROT_READ | PROT_WRITE, 
-              MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-   if (ptr == MAP_FAILED) 
+   ptr = malloc(sz);
+
+   /* ptr = mmap(NULL, sz, PROT_READ | PROT_WRITE,  */
+   /*            MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); */
+   if (!ptr)
      {
         ERR("Cannot allocate more memory with mmap MAP_ANONYMOUS");
         return NULL;
      }
 
    // note - we SHOULD memset to 0, but we are assuming mmap anon give 0 pages
-   //memset(ptr, 0, newsize);
+   memset(ptr, 0, sz);//newsize);
 
    al = (Alloc *)ptr;
    al->size = sz;
@@ -176,7 +178,9 @@ _gs_free(void *ptr)
    al->allocated -= sz;
    if (al->count > 0) return;
    alloc[al->slot] = NULL;
-   munmap(al, al->size);
+
+   free(al);
+//   munmap(al, al->size);
 }
 
 static void 

-- 


Reply via email to