diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/Makefile.am | 2 | ||||
| -rw-r--r-- | backend/ev-async-renderer.c | 81 | ||||
| -rw-r--r-- | backend/ev-async-renderer.h | 59 | ||||
| -rw-r--r-- | backend/ev-job-queue.c | 241 | ||||
| -rw-r--r-- | backend/ev-jobs.c | 37 | ||||
| -rw-r--r-- | backend/ev-jobs.h | 1 |
6 files changed, 355 insertions, 66 deletions
diff --git a/backend/Makefile.am b/backend/Makefile.am index 744c932..322cc7d 100644 --- a/backend/Makefile.am +++ b/backend/Makefile.am @@ -10,6 +10,8 @@ INCLUDES= \ noinst_LTLIBRARIES = libevbackend.la libevbackend_la_SOURCES= \ + ev-async-renderer.c \ + ev-async-renderer.h \ ev-backend-marshal.c \ ev-link.c \ ev-link.h \ diff --git a/backend/ev-async-renderer.c b/backend/ev-async-renderer.c new file mode 100644 index 0000000..45ca7e4 --- /dev/null +++ b/backend/ev-async-renderer.c @@ -0,0 +1,81 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */ +/* + * Copyright (C) 2004 Marco Pesenti Gritti + * + * 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, 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 "config.h" + +#include "ev-async-renderer.h" + +static void ev_async_renderer_class_init (gpointer g_class); + +enum +{ + RENDER_FINISHED, + LAST_SIGNAL +}; + +static guint signals[LAST_SIGNAL] = { 0 }; + +GType +ev_async_renderer_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) + { + static const GTypeInfo our_info = + { + sizeof (EvAsyncRendererIface), + NULL, + NULL, + (GClassInitFunc)ev_async_renderer_class_init + }; + + type = g_type_register_static (G_TYPE_INTERFACE, + "EvAsyncRenderer", + &our_info, (GTypeFlags)0); + } + + return type; +} + +static void +ev_async_renderer_class_init (gpointer g_class) +{ + signals[RENDER_FINISHED] = + g_signal_new ("render_finished", + EV_TYPE_ASYNC_RENDERER, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EvAsyncRendererIface, render_finished), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, + 1, + GDK_TYPE_PIXBUF); +} + +void +ev_async_renderer_render_pixbuf (EvAsyncRenderer *async_renderer, + int page, + double scale) +{ + EvAsyncRendererIface *iface = EV_ASYNC_RENDERER_GET_IFACE (async_renderer); + + iface->render_pixbuf (async_renderer, page, scale); +} diff --git a/backend/ev-async-renderer.h b/backend/ev-async-renderer.h new file mode 100644 index 0000000..044ee62 --- /dev/null +++ b/backend/ev-async-renderer.h @@ -0,0 +1,59 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */ +/* + * Copyright (C) 2000-2003 Marco Pesenti Gritti + * + * 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, 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. + * + */ + +#ifndef EV_ASYNC_RENDERER_H +#define EV_ASYNC_RENDERER_H + +#include <glib-object.h> +#include <glib.h> +#include <gdk/gdkpixbuf.h> + +G_BEGIN_DECLS + +#define EV_TYPE_ASYNC_RENDERER (ev_async_renderer_get_type ()) +#define EV_ASYNC_RENDERER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_ASYNC_RENDERER, EvAsyncRenderer)) +#define EV_ASYNC_RENDERER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_ASYNC_RENDERER, EvAsyncRendererIface)) +#define EV_IS_ASYNC_RENDERER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EV_TYPE_ASYNC_RENDERER)) +#define EV_IS_ASYNC_RENDERER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EV_TYPE_ASYNC_RENDERER)) +#define EV_ASYNC_RENDERER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EV_TYPE_ASYNC_RENDERER, EvAsyncRendererIface)) + +typedef struct _EvAsyncRenderer EvAsyncRenderer; +typedef struct _EvAsyncRendererIface EvAsyncRendererIface; + +struct _EvAsyncRendererIface +{ + GTypeInterface base_iface; + + void (* render_finished) (EvAsyncRenderer *renderer, + GdkPixbuf *pixbuf); + + void (* render_pixbuf) (EvAsyncRenderer *renderer, + int page, + double scale); +}; + +GType ev_async_renderer_get_type (void); +void ev_async_renderer_render_pixbuf (EvAsyncRenderer *renderer, + int page, + double scale); + +G_END_DECLS + +#endif diff --git a/backend/ev-job-queue.c b/backend/ev-job-queue.c index 72470ee..1b3e496 100644 --- a/backend/ev-job-queue.c +++ b/backend/ev-job-queue.c @@ -13,6 +13,14 @@ static GQueue *render_queue_low = NULL; static GQueue *thumbnail_queue_high = NULL; static GQueue *thumbnail_queue_low = NULL; +/* Queues used for backends supporting EvAsyncRender interface, + they are executed on the main thread */ +static GQueue *async_render_queue_high = NULL; +static GQueue *async_render_queue_low = NULL; +static gboolean async_rendering = FALSE; + +static void ev_job_queue_run_next (void); + static gboolean remove_job_from_queue_locked (GQueue *queue, EvJob *job) { @@ -28,6 +36,19 @@ remove_job_from_queue_locked (GQueue *queue, EvJob *job) return FALSE; } +static gboolean +remove_job_from_async_queue (GQueue *queue, EvJob *job) +{ + return remove_job_from_queue_locked (queue, job); +} + +static void +add_job_to_async_queue (GQueue *queue, EvJob *job) +{ + g_object_ref (job); + g_queue_push_tail (queue, job); +} + static void add_job_to_queue_locked (GQueue *queue, EvJob *job) @@ -37,7 +58,6 @@ add_job_to_queue_locked (GQueue *queue, g_cond_broadcast (render_cond); } - static gboolean notify_finished (GObject *job) { @@ -46,12 +66,29 @@ notify_finished (GObject *job) return FALSE; } +static void +job_finished_cb (EvJob *job) +{ + g_object_unref (job); + async_rendering = FALSE; + ev_job_queue_run_next (); +} static void handle_job (EvJob *job) { g_object_ref (G_OBJECT (job)); + if (EV_JOB (job)->async) { + async_rendering = TRUE; + if (EV_IS_JOB_RENDER (job)) { + g_signal_connect (job, "finished", + G_CALLBACK (job_finished_cb), NULL); + } else { + g_assert_not_reached (); + } + } + if (EV_IS_JOB_THUMBNAIL (job)) ev_job_thumbnail_run (EV_JOB_THUMBNAIL (job)); else if (EV_IS_JOB_LINKS (job)) @@ -59,11 +96,13 @@ handle_job (EvJob *job) else if (EV_IS_JOB_RENDER (job)) ev_job_render_run (EV_JOB_RENDER (job)); - /* We let the idle own a ref, as we (the queue) are done with the job. */ - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, - (GSourceFunc) notify_finished, - job, - g_object_unref); + if (!EV_JOB (job)->async) { + /* We let the idle own a ref, as we (the queue) are done with the job. */ + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, + (GSourceFunc) notify_finished, + job, + g_object_unref); + } } static EvJob * @@ -129,6 +168,24 @@ ev_render_thread (gpointer data) } +static void +ev_job_queue_run_next (void) +{ + EvJob *job; + + job = (EvJob *) g_queue_pop_head (async_render_queue_high); + + if (job == NULL) { + job = (EvJob *) g_queue_pop_head (async_render_queue_low); + } + + /* Now that we have our job, we handle it */ + if (job) { + handle_job (job); + g_object_unref (G_OBJECT (job)); + } +} + /* Public Functions */ void ev_job_queue_init (void) @@ -141,6 +198,8 @@ ev_job_queue_init (void) links_queue = g_queue_new (); render_queue_high = g_queue_new (); render_queue_low = g_queue_new (); + async_render_queue_high = g_queue_new (); + async_render_queue_low = g_queue_new (); thumbnail_queue_high = g_queue_new (); thumbnail_queue_low = g_queue_new (); @@ -152,19 +211,28 @@ static GQueue * find_queue (EvJob *job, EvJobPriority priority) { - if (EV_IS_JOB_RENDER (job)) { - if (priority == EV_JOB_PRIORITY_HIGH) - return render_queue_high; - else - return render_queue_low; - } else if (EV_IS_JOB_THUMBNAIL (job)) { - if (priority == EV_JOB_PRIORITY_HIGH) - return thumbnail_queue_high; - else - return thumbnail_queue_low; - } else if (EV_IS_JOB_LINKS (job)) { - /* the priority doesn't effect links */ - return links_queue; + if (EV_JOB (job)->async) { + if (EV_IS_JOB_RENDER (job)) { + if (priority == EV_JOB_PRIORITY_HIGH) + return async_render_queue_high; + else + return async_render_queue_low; + } + } else { + if (EV_IS_JOB_RENDER (job)) { + if (priority == EV_JOB_PRIORITY_HIGH) + return render_queue_high; + else + return render_queue_low; + } else if (EV_IS_JOB_THUMBNAIL (job)) { + if (priority == EV_JOB_PRIORITY_HIGH) + return thumbnail_queue_high; + else + return thumbnail_queue_low; + } else if (EV_IS_JOB_LINKS (job)) { + /* the priority doesn't effect links */ + return links_queue; + } } g_assert_not_reached (); @@ -181,9 +249,52 @@ ev_job_queue_add_job (EvJob *job, queue = find_queue (job, priority); + if (!EV_JOB (job)->async) { + g_mutex_lock (ev_queue_mutex); + add_job_to_queue_locked (queue, job); + g_mutex_unlock (ev_queue_mutex); + } else { + add_job_to_async_queue (queue, job); + if (!async_rendering) { + ev_job_queue_run_next (); + } + } +} + +static gboolean +move_job_async (EvJob *job, GQueue *old_queue, GQueue *new_queue) +{ + gboolean retval = FALSE; + + g_object_ref (job); + + if (remove_job_from_queue_locked (old_queue, job)) { + add_job_to_async_queue (new_queue, job); + retval = TRUE; + } + + g_object_unref (job); + + return retval; +} + +static gboolean +move_job (EvJob *job, GQueue *old_queue, GQueue *new_queue) +{ + gboolean retval = FALSE; + g_mutex_lock (ev_queue_mutex); - add_job_to_queue_locked (queue, job); + g_object_ref (job); + + if (remove_job_from_queue_locked (old_queue, job)) { + add_job_to_queue_locked (new_queue, job); + retval = TRUE; + } + + g_object_unref (job); g_mutex_unlock (ev_queue_mutex); + + return retval; } gboolean @@ -194,38 +305,39 @@ ev_job_queue_update_job (EvJob *job, g_return_val_if_fail (EV_IS_JOB (job), FALSE); - g_mutex_lock (ev_queue_mutex); - g_object_ref (job); - - if (EV_IS_JOB_THUMBNAIL (job)) { - if (new_priority == EV_JOB_PRIORITY_LOW) { - if (remove_job_from_queue_locked (thumbnail_queue_high, job)) { - add_job_to_queue_locked (thumbnail_queue_low, job); - retval = TRUE; - } - } else if (new_priority == EV_JOB_PRIORITY_HIGH) { - if (remove_job_from_queue_locked (thumbnail_queue_low, job)) { - add_job_to_queue_locked (thumbnail_queue_high, job); - retval = TRUE; + if (EV_JOB (job)->async) { + if (EV_IS_JOB_RENDER (job)) { + if (new_priority == EV_JOB_PRIORITY_LOW) { + retval = move_job_async (job, async_render_queue_high, + async_render_queue_low); + } else if (new_priority == EV_JOB_PRIORITY_HIGH) { + retval = move_job_async (job, async_render_queue_low, + async_render_queue_high); } + } else { + g_assert_not_reached (); } - } else if (EV_IS_JOB_RENDER (job)) { - if (new_priority == EV_JOB_PRIORITY_LOW) { - if (remove_job_from_queue_locked (render_queue_high, job)) { - add_job_to_queue_locked (render_queue_low, job); - retval = TRUE; + } else { + if (EV_IS_JOB_THUMBNAIL (job)) { + if (new_priority == EV_JOB_PRIORITY_LOW) { + retval = move_job (job, thumbnail_queue_high, + thumbnail_queue_low); + } else if (new_priority == EV_JOB_PRIORITY_HIGH) { + retval = move_job (job, thumbnail_queue_low, + thumbnail_queue_high); } - } else if (new_priority == EV_JOB_PRIORITY_HIGH) { - if (remove_job_from_queue_locked (render_queue_low, job)) { - add_job_to_queue_locked (render_queue_high, job); - retval = TRUE; + } else if (EV_IS_JOB_RENDER (job)) { + if (new_priority == EV_JOB_PRIORITY_LOW) { + retval = move_job (job, render_queue_high, + render_queue_low); + } else if (new_priority == EV_JOB_PRIORITY_HIGH) { + retval = move_job (job, render_queue_low, + render_queue_high); } + } else { + g_assert_not_reached (); } - } else { - /* We don't have a priority queue for any of the other jobs */ - } - g_object_unref (job); - g_mutex_unlock (ev_queue_mutex); + } return retval; } @@ -237,22 +349,31 @@ ev_job_queue_remove_job (EvJob *job) g_return_val_if_fail (EV_IS_JOB (job), FALSE); - g_mutex_lock (ev_queue_mutex); - - if (EV_IS_JOB_THUMBNAIL (job)) { - retval = remove_job_from_queue_locked (thumbnail_queue_high, job); - retval = retval || remove_job_from_queue_locked (thumbnail_queue_low, job); - } else if (EV_IS_JOB_RENDER (job)) { - retval = remove_job_from_queue_locked (render_queue_high, job); - retval = retval || remove_job_from_queue_locked (render_queue_low, job); - } else if (EV_IS_JOB_LINKS (job)) { - retval = remove_job_from_queue_locked (links_queue, job); + if (EV_JOB (job)->async) { + if (EV_IS_JOB_RENDER (job)) { + retval = remove_job_from_async_queue (async_render_queue_high, job); + retval = retval || remove_job_from_async_queue (async_render_queue_low, job); + } else { + g_assert_not_reached (); + } } else { - g_assert_not_reached (); + g_mutex_lock (ev_queue_mutex); + + if (EV_IS_JOB_THUMBNAIL (job)) { + retval = remove_job_from_queue_locked (thumbnail_queue_high, job); + retval = retval || remove_job_from_queue_locked (thumbnail_queue_low, job); + } else if (EV_IS_JOB_RENDER (job)) { + retval = remove_job_from_queue_locked (render_queue_high, job); + retval = retval || remove_job_from_queue_locked (render_queue_low, job); + } else if (EV_IS_JOB_LINKS (job)) { + retval = remove_job_from_queue_locked (links_queue, job); + } else { + g_assert_not_reached (); + } + + g_mutex_unlock (ev_queue_mutex); } - g_mutex_unlock (ev_queue_mutex); - return retval; } diff --git a/backend/ev-jobs.c b/backend/ev-jobs.c index c4556c9..73b0614 100644 --- a/backend/ev-jobs.c +++ b/backend/ev-jobs.c @@ -2,6 +2,7 @@ #include "ev-job-queue.h" #include "ev-document-thumbnails.h" #include "ev-document-links.h" +#include "ev-async-renderer.h" static void ev_job_init (EvJob *job); static void ev_job_class_init (EvJobClass *class); @@ -196,9 +197,24 @@ ev_job_render_new (EvDocument *document, job->target_height = height; job->include_links = include_links; + if (EV_IS_ASYNC_RENDERER (document)) { + EV_JOB (job)->async = TRUE; + } + return EV_JOB (job); } +static void +render_finished_cb (EvDocument *document, GdkPixbuf *pixbuf, EvJobRender *job) +{ + g_signal_handlers_disconnect_by_func (EV_JOB (job)->document, + render_finished_cb, job); + + EV_JOB (job)->finished = TRUE; + job->pixbuf = g_object_ref (pixbuf); + ev_job_finished (EV_JOB (job)); +} + void ev_job_render_run (EvJobRender *job) { @@ -206,12 +222,21 @@ ev_job_render_run (EvJobRender *job) ev_document_doc_mutex_lock (); - job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document, - job->page, - job->scale); - if (job->include_links) - job->link_mapping = ev_document_get_links (EV_JOB (job)->document, job->page); - EV_JOB (job)->finished = TRUE; + if (EV_JOB (job)->async) { + EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document); + ev_async_renderer_render_pixbuf (renderer, job->page, job->scale); + g_signal_connect (EV_JOB (job)->document, "render_finished", + G_CALLBACK (render_finished_cb), job); + } else { + job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document, + job->page, + job->scale); + if (job->include_links) + job->link_mapping = ev_document_get_links (EV_JOB (job)->document, job->page); + + EV_JOB (job)->finished = TRUE; + } + ev_document_doc_mutex_unlock (); } diff --git a/backend/ev-jobs.h b/backend/ev-jobs.h index 1b64e01..c89aa1e 100644 --- a/backend/ev-jobs.h +++ b/backend/ev-jobs.h @@ -67,6 +67,7 @@ struct _EvJob GObject parent; EvDocument *document; gboolean finished; + gboolean async; }; struct _EvJobClass |