From a44f424dc5161a156e922056e5480906c9ec1f49 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Nov 2004 05:42:49 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 7 +++ ChangeLog.pre-2-10 | 7 +++ ChangeLog.pre-2-6 | 7 +++ ChangeLog.pre-2-8 | 7 +++ tests/Makefile.am | 2 + tests/pixbuf-threads.c | 118 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 148 insertions(+) create mode 100644 tests/pixbuf-threads.c diff --git a/ChangeLog b/ChangeLog index 91efdf2b1a..4aa70c6409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-12 Matthias Clasen + + * tests/Makefile.am: Add pixbuf-threads + + * tests/pixbuf-threads.c: Test loading images in multiple + threads. + 2004-11-11 Matthias Clasen * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 91efdf2b1a..4aa70c6409 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-11-12 Matthias Clasen + + * tests/Makefile.am: Add pixbuf-threads + + * tests/pixbuf-threads.c: Test loading images in multiple + threads. + 2004-11-11 Matthias Clasen * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 91efdf2b1a..4aa70c6409 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-11-12 Matthias Clasen + + * tests/Makefile.am: Add pixbuf-threads + + * tests/pixbuf-threads.c: Test loading images in multiple + threads. + 2004-11-11 Matthias Clasen * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 91efdf2b1a..4aa70c6409 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-11-12 Matthias Clasen + + * tests/Makefile.am: Add pixbuf-threads + + * tests/pixbuf-threads.c: Test loading images in multiple + threads. + 2004-11-11 Matthias Clasen * configure.in: Check for uxtheme.h (#157967, J. Ali Harlow) diff --git a/tests/Makefile.am b/tests/Makefile.am index cce2e839db..37cb164ed0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -65,6 +65,7 @@ noinst_PROGRAMS = \ pixbuf-lowmem \ pixbuf-randomly-modified \ pixbuf-random \ + pixbuf-threads \ testmerge \ testactions @@ -143,6 +144,7 @@ pixbuf_read_LDADD = $(LDADDS) pixbuf_lowmem_LDADD = $(LDADDS) pixbuf_randomly_modified_LDADD = $(LDADDS) pixbuf_random_LDADD = $(LDADDS) +pixbuf_threads_LDADD = $(LDADDS) $(GTHREAD_LIBS) testmerge_LDADD = $(LDADDS) testactions_LDADD = $(LDADDS) diff --git a/tests/pixbuf-threads.c b/tests/pixbuf-threads.c new file mode 100644 index 0000000000..5a8ce5f622 --- /dev/null +++ b/tests/pixbuf-threads.c @@ -0,0 +1,118 @@ +/* -*- Mode: C; c-basic-offset: 2; -*- */ +/* GdkPixbuf library - test loaders + * + * Copyright (C) 2004 Matthias Clasen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include "gdk-pixbuf/gdk-pixbuf.h" +#include +#include +#include + +static gboolean verbose = FALSE; + +static void +load_image (gpointer data, + gpointer user_data) +{ + gchar *filename = data; + FILE *file; + int nbytes; + char buf[1024]; + size_t bufsize = 1024; + GdkPixbufLoader *loader; + GError *error = NULL; + GThread *self; + + self = g_thread_self (); + loader = gdk_pixbuf_loader_new (); + + file = fopen (filename, "r"); + g_assert (file); + + if (verbose) g_print ("%p start image %s\n", self, filename); + while (!feof (file)) + { + nbytes = fread (buf, 1, bufsize, file); + if (!gdk_pixbuf_loader_write (loader, buf, nbytes, &error)) + { + g_warning ("Error writing %s to loader: %s", filename, error->message); + g_error_free (error); + error = NULL; + break; + } + if (verbose) g_print ("%p read %d bytes\n", self, nbytes); + + g_thread_yield (); + } + + fclose (file); + + if (verbose) g_print ("%p finish image %s\n", self, filename); + + if (!gdk_pixbuf_loader_close (loader, &error)) + { + g_warning ("Error closing loader for %s: %s", filename, error->message); + g_error_free (error); + } + + g_object_unref (loader); +} + +static void +usage (void) +{ + g_print ("usage: pixbuf-threads [--verbose] \n"); + exit (EXIT_FAILURE); +} + +int +main (int argc, char **argv) +{ + int i, start; + GThreadPool *pool; + + g_type_init (); + + if (!g_thread_supported ()) + g_thread_init (NULL); + + g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL); + + if (argc == 1) + usage(); + + start = 1; + if (strcmp (argv[1], "--verbose") == 0) + { + verbose = TRUE; + start = 2; + } + + pool = g_thread_pool_new (load_image, NULL, 20, FALSE, NULL); + + i = start; + while (1) { + i++; + if (i == argc) + i = start; + g_thread_pool_push (pool, argv[i], NULL); + } + + return 0; +}