Attachment 139711 Details for Bug 106618 – Add FcCacheAllocate() helper

[patch] Add FcCacheAllocate() helper

0001-Add-FcCacheAllocate-helper.patch (text/plain), 2.67 KB, created by Alexander Larsson on 2018-05-23 14:10:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Larsson

Created: 2018-05-23 14:10:39 UTC

Size: 2.67 KB

patch

obsolete

>From 814fd49bb613a655d2249a9f3eb653318ab31e5f Mon Sep 17 00:00:00 2001
>From: Alexander Larsson <alexl@redhat.com>
>Date: Wed, 23 May 2018 15:08:12 +0200
>Subject: [PATCH 1/3] Add FcCacheAllocate() helper
>
>This lets you allocate a chunk of memory that will be freed when the cache
>is freed.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106618
>---
> src/fccache.c | 36 ++++++++++++++++++++++++++++++++++++
> src/fcint.h   |  4 ++++
> 2 files changed, 40 insertions(+)
>
>diff --git a/src/fccache.c b/src/fccache.c
>index 27b1282..041c77b 100644
>--- a/src/fccache.c
>+++ b/src/fccache.c
>@@ -443,6 +443,7 @@ struct _FcCacheSkip {
>     FcCache	    *cache;
>     FcRef	    ref;
>     intptr_t	    size;
>+    void	   *allocated;
>     dev_t	    cache_dev;
>     ino_t	    cache_ino;
>     time_t	    cache_mtime;
>@@ -568,6 +569,7 @@ FcCacheInsert (FcCache *cache, struct stat *cache_stat)
> 
>     s->cache = cache;
>     s->size = cache->size;
>+    s->allocated = NULL;
>     FcRefInit (&s->ref, 1);
>     if (cache_stat)
>     {
>@@ -642,6 +644,7 @@ FcCacheRemoveUnlocked (FcCache *cache)
>     FcCacheSkip	    **update[FC_CACHE_MAX_LEVEL];
>     FcCacheSkip	    *s, **next;
>     int		    i;
>+    void            *allocated;
> 
>     /*
>      * Find links along each chain
>@@ -659,6 +662,15 @@ FcCacheRemoveUnlocked (FcCache *cache)
> 	*update[i] = s->next[i];
>     while (fcCacheMaxLevel > 0 && fcCacheChains[fcCacheMaxLevel - 1] == NULL)
> 	fcCacheMaxLevel--;
>+
>+    allocated = s->allocated;
>+    while (allocated)
>+    {
>+	/* First element in allocated chunk is the free list */
>+	next = *(void **)allocated;
>+	free (allocated);
>+	allocated = next;
>+    }
>     free (s);
> }
> 
>@@ -728,6 +740,30 @@ FcCacheObjectDereference (void *object)
>     unlock_cache ();
> }
> 
>+void *
>+FcCacheAllocate (FcCache *cache, size_t len)
>+{
>+    FcCacheSkip	*skip;
>+    void *allocated = NULL;
>+
>+    lock_cache ();
>+    skip = FcCacheFindByAddrUnlocked (cache);
>+    if (skip)
>+    {
>+      void *chunk = malloc (sizeof (void *) + len);
>+      if (chunk)
>+      {
>+	  /* First element in allocated chunk is the free list */
>+	  *(void **)chunk = skip->allocated;
>+	  skip->allocated = chunk;
>+	  /* Return the rest */
>+	  allocated = ((FcChar8 *)chunk) + sizeof (void *);
>+      }
>+    }
>+    unlock_cache ();
>+    return allocated;
>+}
>+
> void
> FcCacheFini (void)
> {
>diff --git a/src/fcint.h b/src/fcint.h
>index a402ca2..fe21583 100644
>--- a/src/fcint.h
>+++ b/src/fcint.h
>@@ -617,9 +617,13 @@ FcCacheObjectReference (void *object);
> FcPrivate void
> FcCacheObjectDereference (void *object);
> 
>+FcPrivate void *
>+FcCacheAllocate (FcCache *cache, size_t len);
>+
> FcPrivate void
> FcCacheFini (void);
> 
>+
> FcPrivate void
> FcDirCacheReference (FcCache *cache, int nref);
> 
>-- 
>2.17.0
>

Actions: View | Splinter Review

Attachments on bug 106618: 139711 | 139712 | 139713 | 139720 | 139730 | 139731

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.