From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:36531)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QZN0h-0003U1-PC
	for qemu-devel@nongnu.org; Wed, 22 Jun 2011 08:58:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QZN0g-0008Vr-5O
	for qemu-devel@nongnu.org; Wed, 22 Jun 2011 08:58:23 -0400
Received: from mail-yx0-f173.google.com ([209.85.213.173]:40677)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1QZN0f-0008Vm-P1
	for qemu-devel@nongnu.org; Wed, 22 Jun 2011 08:58:21 -0400
Received: by yxs7 with SMTP id 7so395933yxs.4
	for <qemu-devel@nongnu.org>; Wed, 22 Jun 2011 05:58:21 -0700 (PDT)
Message-ID: <4E01E6EB.2000801@codemonkey.ws>
Date: Wed, 22 Jun 2011 07:58:19 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1308557567-27600-1-git-send-email-avi@redhat.com>
In-Reply-To: <1308557567-27600-1-git-send-email-avi@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2] Optimize screendump
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Avi Kivity <avi@redhat.com>
Cc: qemu-devel@nongnu.org

On 06/20/2011 03:12 AM, Avi Kivity wrote:
> When running kvm-autotest, fputc() is often the second highest (sometimes #1)
> function showing up in a profile.  This is due to fputc() locking the file
> for every byte written.
>
> Optimize by buffering a line's worth of pixels and writing that out in a
> single call.
>
> Signed-off-by: Avi Kivity<avi@redhat.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>
> v2: drop unportable fputc_unlocked
>
>   hw/vga.c |   13 ++++++++++---
>   1 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/hw/vga.c b/hw/vga.c
> index d5bc582..97c96bf 100644
> --- a/hw/vga.c
> +++ b/hw/vga.c
> @@ -2349,15 +2349,19 @@ int ppm_save(const char *filename, struct DisplaySurface *ds)
>       uint32_t v;
>       int y, x;
>       uint8_t r, g, b;
> +    int ret;
> +    char *linebuf, *pbuf;
>
>       f = fopen(filename, "wb");
>       if (!f)
>           return -1;
>       fprintf(f, "P6\n%d %d\n%d\n",
>               ds->width, ds->height, 255);
> +    linebuf = qemu_malloc(ds->width * 3);
>       d1 = ds->data;
>       for(y = 0; y<  ds->height; y++) {
>           d = d1;
> +        pbuf = linebuf;
>           for(x = 0; x<  ds->width; x++) {
>               if (ds->pf.bits_per_pixel == 32)
>                   v = *(uint32_t *)d;
> @@ -2369,13 +2373,16 @@ int ppm_save(const char *filename, struct DisplaySurface *ds)
>                   (ds->pf.gmax + 1);
>               b = ((v>>  ds->pf.bshift)&  ds->pf.bmax) * 256 /
>                   (ds->pf.bmax + 1);
> -            fputc(r, f);
> -            fputc(g, f);
> -            fputc(b, f);
> +            *pbuf++ = r;
> +            *pbuf++ = g;
> +            *pbuf++ = b;
>               d += ds->pf.bytes_per_pixel;
>           }
>           d1 += ds->linesize;
> +        ret = fwrite(linebuf, 1, pbuf - linebuf, f);
> +        (void)ret;
>       }
> +    qemu_free(linebuf);
>       fclose(f);
>       return 0;
>   }