From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: trunk r113947: * image.c: Fix animation cache signature memory leak. Date: Mon, 19 Aug 2013 12:46:11 -0700 Organization: UCLA Computer Science Department Message-ID: <52127603.5030809@cs.ucla.edu> References: <521244F0.3060508@cs.ucla.edu> <521246C4.3070004@cs.ucla.edu> <52124E37.2080709@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1376941596 25282 80.91.229.3 (19 Aug 2013 19:46:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 19 Aug 2013 19:46:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: Lars Magne Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 19 21:46:35 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VBVPM-0006Xn-SV for ged-emacs-devel@m.gmane.org; Mon, 19 Aug 2013 21:46:33 +0200 Original-Received: from localhost ([::1]:44635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBVPM-0003jK-Hu for ged-emacs-devel@m.gmane.org; Mon, 19 Aug 2013 15:46:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBVPE-0003jB-Ue for emacs-devel@gnu.org; Mon, 19 Aug 2013 15:46:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VBVP8-00037O-Ps for emacs-devel@gnu.org; Mon, 19 Aug 2013 15:46:24 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:44440) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VBVP8-000379-HC for emacs-devel@gnu.org; Mon, 19 Aug 2013 15:46:18 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id E4FD539E80FF; Mon, 19 Aug 2013 12:46:16 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IGs+WxXB8ztb; Mon, 19 Aug 2013 12:46:12 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-71-108-49-126.lsanca.fios.verizon.net [71.108.49.126]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 43EF639E80F8; Mon, 19 Aug 2013 12:46:12 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 In-Reply-To: X-Enigmail-Version: 1.5.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:162891 Archived-At: Lars Magne Ingebrigtsen wrote: > calling the cache pruning function now and then would probably > be a good idea? I'm not sure where it should be called from, though. > The idle timer? Sounds plausible, though I'm not an idle-timer expert. > if that can be tuned, then it would probably be nice to get rid of > the extra memory. Sure, that's easy. Something like this, perhaps? What images do you use to test this sort of thing on? === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-19 17:56:58 +0000 +++ src/ChangeLog 2013-08-19 19:33:19 +0000 @@ -1,3 +1,19 @@ +2013-08-19 Paul Eggert + + * image.c: Shrink memory needed for animation cache. + (SIGNATURE_DIGESTSIZE): New constant. + (struct animation_cache): Make 'signature' a fixed size array of bytes. + (imagemagick_create_cache): Copy the signature. This saves + several KB of memory that ImageMagick wastes per signature. + Don't bother updating the update_time, as the caller does that now. + (imagemagick_prune_animation_cache): Don't destroy the signature, as + it's a fixed size struct member now. + (imagemagick_get_animation_cache): Always destroy the signature, + as it's now imagemagick_create_cache's responsibility to copy it. + Avoid duplicate calls to strcmp and to imagemagick_create_cache, + and use memcmp rather than strcmp. + eassert that ImageMagick returns a signature of the specified length. + 2013-08-19 Lars Magne Ingebrigtsen * image.c (imagemagick_get_animation_cache): Don't segfault on === modified file 'src/image.c' --- src/image.c 2013-08-19 17:56:58 +0000 +++ src/image.c 2013-08-19 19:33:19 +0000 @@ -7876,13 +7876,17 @@ separate from the image cache, because the images may be scaled before display. */ +/* Size of ImageMagick image signatures, in bytes. It's SHA-256 as a + hex string, so it's 256 bits represented via 4 bits per byte. */ +enum { SIGNATURE_DIGESTSIZE = 256 / 4 }; + struct animation_cache { - char *signature; MagickWand *wand; int index; EMACS_TIME update_time; struct animation_cache *next; + char signature[SIGNATURE_DIGESTSIZE]; }; static struct animation_cache *animation_cache = NULL; @@ -7891,11 +7895,10 @@ imagemagick_create_cache (char *signature) { struct animation_cache *cache = xmalloc (sizeof *cache); - cache->signature = signature; cache->wand = 0; cache->index = 0; cache->next = 0; - cache->update_time = current_emacs_time (); + memcpy (cache->signature, signature, SIGNATURE_DIGESTSIZE); return cache; } @@ -7914,7 +7917,6 @@ pcache = &cache->next; else { - DestroyString (cache->signature); if (cache->wand) DestroyMagickWand (cache->wand); *pcache = cache->next; @@ -7928,24 +7930,22 @@ { char *signature = MagickGetImageSignature (wand); struct animation_cache *cache; + struct animation_cache **pcache = &animation_cache; + eassert (strlen (signature) == SIGNATURE_DIGESTSIZE); imagemagick_prune_animation_cache (); - cache = animation_cache; - - if (! cache) - { - animation_cache = imagemagick_create_cache (signature); - return animation_cache; - } - - while (strcmp (signature, cache->signature) && - cache->next) - cache = cache->next; - - if (strcmp (signature, cache->signature)) - { - cache->next = imagemagick_create_cache (signature); - return cache->next; + + while (1) + { + cache = *pcache; + if (! cache) + { + *pcache = cache = imagemagick_create_cache (signature); + break; + } + if (memcmp (signature, cache->signature, SIGNATURE_DIGESTSIZE) == 0) + break; + pcache = &cache->next; } DestroyString (signature);