Changeset 5e3e42c7 in mainline

Timestamp:

2020-06-16T10:52:38Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

94f3747

Parents:

3e640e5

git-author:

Jiri Svoboda <jiri@…> (2020-06-15 17:31:57)

git-committer:

Jiri Svoboda <jiri@…> (2020-06-16 10:52:38)

Message:

IPC GC server needs to destroy area it shared in

Location:

uspace/lib/ipcgfx

Files:

• private/server.h (modified) (2 diffs)
• src/server.c (modified) (3 diffs)

uspace/lib/ipcgfx/private/server.h

@@ -43 +43 @@
 #include <gfx/context.h>
 #include <gfx/coord.h>
+#include <stdbool.h>
 
 /** Server-side of IPC GC connection.
@@ -65 +66 @@
         /** Bitmap ID */
         sysarg_t bmp_id;
+        /** @c true if we allocated the pixels */
+        bool myalloc;
+        /** Pixels of the bitmap */
+        void *pixels;
 } ipc_gc_srv_bitmap_t;
 

uspace/lib/ipcgfx/src/server.c

@@ -164 +164 @@
             (unsigned) srvbmp->bmp_id);
 
+        /* We created the memory area by sharing it in */
+        srvbmp->myalloc = true;
+        srvbmp->pixels = pixels;
+
         async_answer_1(icall, EOK, srvbmp->bmp_id);
 }
@@ -246 +250 @@
         srvbmp->bmp = bitmap;
         srvbmp->bmp_id = srvgc->next_bmp_id++;
+
+        /* Area allocated by backing GC, we just shared it out */
+        srvbmp->myalloc = false;
+        srvbmp->pixels = alloc.pixels; // Not really needed
+
         printf("gc_bitmap_create_doutput_srv: storing bmp_id=%u\n",
             (unsigned) srvbmp->bmp_id);
@@ -271 +280 @@
                 return;
         }
+
+        if (bitmap->myalloc)
+                as_area_destroy(bitmap->pixels);
 
         list_remove(&bitmap->lbitmaps);