2002-11-18 Sven Neumann <sven@gimp.org> Finally landed the new GimpConfig based gimprc parser. It's not finished yet but we need to start somewhere. This release removes the old gimprc.[ch] files. The gimprc format changes slightly, but the changes are minimal. The Preferences dialog is temporarily disabled since it still needs to be ported. If you are are afraid, stay away from CVS for a few days ;-) * app/Makefile.am * app/gimprc.[ch]: removed the old gimprc system. * app/base/Makefile.am * app/base/base-config.[ch]: removed these files in favor of config/gimpbaseconfig.[ch]. * app/core/Makefile.am * app/core/gimpcoreconfig.[ch]: removed these files in favor of config/gimpcoreconfig.[ch]. * app/config/Makefile.am * app/config/config-types.h: moved typedefs into this new file. * app/config/gimpbaseconfig.[ch] * app/config/gimpcoreconfig.[ch] * app/config/gimpdisplayconfig.[ch] * app/config/gimpguiconfig.[ch] * app/config/gimprc.[ch] * app/config/test-config.c: brought into shape for real use. * app/base/base-types.h: include config/config-types.h here. Added a global GimpBaseConfig *base_config variable to ease migration. * app/gui/Makefile.am: temporarily disabled the preferences dialog. * app/app_procs.c * app/undo.c * app/undo_history.c * app/base/base.[ch] * app/base/gimphistogram.c * app/base/pixel-processor.c * app/base/temp-buf.c * app/base/tile-cache.c * app/core/core-types.h * app/core/gimp-documents.c * app/core/gimp.c * app/core/gimpbrush.c * app/core/gimpbrushgenerated.c * app/core/gimpcontext.c * app/core/gimpdrawable-transform.c * app/core/gimpimage-new.c * app/core/gimpimage.c * app/core/gimpimagefile.c * app/core/gimpmodules.c * app/core/gimppattern.c * app/display/Makefile.am * app/display/gimpdisplay-handlers.c * app/display/gimpdisplay.[ch] * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-handlers.c * app/display/gimpdisplayshell-layer-select.c * app/display/gimpdisplayshell-render.c * app/display/gimpdisplayshell-scale.c * app/display/gimpdisplayshell-scroll.c * app/display/gimpdisplayshell-selection.c * app/display/gimpdisplayshell.[ch] * app/display/gimpnavigationview.c * app/file/file-save.c * app/gui/device-status-dialog.c * app/gui/dialogs-constructors.c * app/gui/file-commands.c * app/gui/file-new-dialog.c * app/gui/file-open-dialog.c * app/gui/file-save-dialog.c * app/gui/gui.c * app/gui/menus.c * app/gui/paths-dialog.c * app/gui/resize-dialog.c * app/gui/session.c * app/gui/test-commands.c * app/gui/tips-dialog.c * app/gui/tips-dialog.h * app/gui/user-install-dialog.c * app/gui/view-commands.c * app/paint/gimppaintcore.c * app/plug-in/plug-in.c * app/plug-in/plug-ins.c * app/tools/gimpbezierselecttool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimpinktool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmeasuretool.c * app/tools/gimppainttool.c * app/tools/gimppathtool.c * app/tools/gimptexttool.[ch] * app/tools/selection_options.c * app/tools/tools.c * app/tools/transform_options.c * app/widgets/gimphelp.c * app/widgets/gimpitemfactory.c * app/widgets/gimpselectioneditor.c * app/xcf/xcf-load.c * tools/pdbgen/pdb/fileops.pdb * tools/pdbgen/pdb/gimprc.pdb * tools/pdbgen/pdb/image.pdb * tools/pdbgen/pdb/layer.pdb * tools/pdbgen/pdb/transform_tools.pdb: use the new config system instead of the old gimprc stuff. * etc/gimprc.in * etc/gimprc_user.in: adapted to the new gimprc format. Will update the man-page later... * app/pdb/fileops_cmds.c * app/pdb/gimprc_cmds.c * app/pdb/image_cmds.c * app/pdb/layer_cmds.c * app/pdb/transform_tools_cmds.c * libgimp/gimpgimprc_pdb.c: regenerated.
423 lines
9.1 KiB
C
423 lines
9.1 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* pixel_processor.c: Copyright (C) 1999 Jay Cox <jaycox@earthlink.net>
|
|
*
|
|
* 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 "config.h"
|
|
|
|
#ifdef ENABLE_MP
|
|
#include <pthread.h>
|
|
#define IF_THREAD(statement) statement
|
|
#else /* !ENABLE_MP */
|
|
#define IF_THREAD(statement)
|
|
#endif /* ENABLE_MP */
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "base-types.h"
|
|
|
|
#include "config/gimpbaseconfig.h"
|
|
|
|
#include "pixel-processor.h"
|
|
#include "pixel-region.h"
|
|
|
|
#ifdef ENABLE_MP
|
|
#include "tile.h"
|
|
#endif
|
|
|
|
|
|
typedef void (* p1_func) (gpointer ,
|
|
PixelRegion *);
|
|
typedef void (* p2_func) (gpointer ,
|
|
PixelRegion * ,
|
|
PixelRegion *);
|
|
typedef void (* p3_func) (gpointer ,
|
|
PixelRegion *,
|
|
PixelRegion *,
|
|
PixelRegion *);
|
|
typedef void (* p4_func) (gpointer ,
|
|
PixelRegion *,
|
|
PixelRegion *,
|
|
PixelRegion *,
|
|
PixelRegion *);
|
|
|
|
|
|
struct _PixelProcessor
|
|
{
|
|
gpointer data;
|
|
p_func f;
|
|
PixelRegionIterator *PRI;
|
|
IF_THREAD(pthread_mutex_t mutex;)
|
|
gint nthreads;
|
|
gint n_regions;
|
|
PixelRegion *r[4];
|
|
|
|
void *progress_report_data;
|
|
ProgressReportFunc progress_report_func;
|
|
};
|
|
|
|
|
|
IF_THREAD(
|
|
static void *
|
|
do_parallel_regions (PixelProcessor *p_s)
|
|
{
|
|
PixelRegion tr[4];
|
|
gint n_tiles = 0;
|
|
gint i;
|
|
gint cont = 1;
|
|
|
|
pthread_mutex_lock (&p_s->mutex);
|
|
|
|
if (p_s->nthreads != 0 && p_s->PRI)
|
|
p_s->PRI = pixel_regions_process (p_s->PRI);
|
|
|
|
if (p_s->PRI == NULL)
|
|
{
|
|
pthread_mutex_unlock (&p_s->mutex);
|
|
return NULL;
|
|
}
|
|
|
|
p_s->nthreads++;
|
|
|
|
do
|
|
{
|
|
for (i = 0; i < p_s->n_regions; i++)
|
|
if (p_s->r[i])
|
|
{
|
|
memcpy(&tr[i], p_s->r[i], sizeof(PixelRegion));
|
|
if (tr[i].tiles)
|
|
tile_lock(tr[i].curtile);
|
|
}
|
|
|
|
pthread_mutex_unlock (&p_s->mutex);
|
|
n_tiles++;
|
|
|
|
switch(p_s->n_regions)
|
|
{
|
|
case 1:
|
|
((p1_func)p_s->f)(p_s->data,
|
|
p_s->r[0] ? &tr[0] : NULL);
|
|
break;
|
|
|
|
case 2:
|
|
((p2_func)p_s->f)(p_s->data,
|
|
p_s->r[0] ? &tr[0] : NULL,
|
|
p_s->r[1] ? &tr[1] : NULL);
|
|
break;
|
|
|
|
case 3:
|
|
((p3_func)p_s->f)(p_s->data,
|
|
p_s->r[0] ? &tr[0] : NULL,
|
|
p_s->r[1] ? &tr[1] : NULL,
|
|
p_s->r[2] ? &tr[2] : NULL);
|
|
break;
|
|
|
|
case 4:
|
|
((p4_func)p_s->f)(p_s->data,
|
|
p_s->r[0] ? &tr[0] : NULL,
|
|
p_s->r[1] ? &tr[1] : NULL,
|
|
p_s->r[2] ? &tr[2] : NULL,
|
|
p_s->r[3] ? &tr[3] : NULL);
|
|
break;
|
|
|
|
default:
|
|
g_message("do_parallel_regions: Bad number of regions %d\n",
|
|
p_s->n_regions);
|
|
}
|
|
|
|
pthread_mutex_lock (&p_s->mutex);
|
|
|
|
for (i = 0; i < p_s->n_regions; i++)
|
|
if (p_s->r[i])
|
|
{
|
|
if (tr[i].tiles)
|
|
tile_release(tr[i].curtile, tr[i].dirty);
|
|
}
|
|
|
|
if (p_s->progress_report_func &&
|
|
!p_s->progress_report_func(p_s->progress_report_data,
|
|
p_s->r[0]->x, p_s->r[0]->y,
|
|
p_s->r[0]->w, p_s->r[0]->h))
|
|
cont = 0;
|
|
|
|
}
|
|
while (cont && p_s->PRI &&
|
|
(p_s->PRI = pixel_regions_process (p_s->PRI)));
|
|
|
|
p_s->nthreads--;
|
|
|
|
pthread_mutex_unlock (&p_s->mutex);
|
|
|
|
return NULL;
|
|
}
|
|
)
|
|
|
|
/* do_parallel_regions_single is just like do_parallel_regions
|
|
* except that all the mutex and tile locks have been removed
|
|
*
|
|
* If we are processing with only a single thread we don't need to do the
|
|
* mutex locks etc. and aditional tile locks even if we were
|
|
* configured --with-mp
|
|
*/
|
|
|
|
static gpointer
|
|
do_parallel_regions_single (PixelProcessor *p_s)
|
|
{
|
|
gint cont = 1;
|
|
|
|
do
|
|
{
|
|
switch (p_s->n_regions)
|
|
{
|
|
case 1:
|
|
((p1_func)p_s->f)(p_s->data,
|
|
p_s->r[0]);
|
|
break;
|
|
|
|
case 2:
|
|
((p2_func)p_s->f)(p_s->data,
|
|
p_s->r[0],
|
|
p_s->r[1]);
|
|
break;
|
|
|
|
case 3:
|
|
((p3_func)p_s->f)(p_s->data,
|
|
p_s->r[0],
|
|
p_s->r[1],
|
|
p_s->r[2]);
|
|
break;
|
|
|
|
case 4:
|
|
((p4_func)p_s->f)(p_s->data,
|
|
p_s->r[0],
|
|
p_s->r[1],
|
|
p_s->r[2],
|
|
p_s->r[3]);
|
|
break;
|
|
|
|
default:
|
|
g_message("do_parallel_regions_single: Bad number of regions %d\n",
|
|
p_s->n_regions);
|
|
}
|
|
|
|
if (p_s->progress_report_func)
|
|
if (!p_s->progress_report_func (p_s->progress_report_data,
|
|
p_s->r[0]->x, p_s->r[0]->y,
|
|
p_s->r[0]->w, p_s->r[0]->h))
|
|
cont = 0;
|
|
}
|
|
while (cont && p_s->PRI &&
|
|
(p_s->PRI = pixel_regions_process (p_s->PRI)));
|
|
|
|
return NULL;
|
|
}
|
|
|
|
#define MAX_THREADS 30
|
|
|
|
static void
|
|
pixel_regions_do_parallel (PixelProcessor *p_s)
|
|
{
|
|
IF_THREAD(
|
|
gint nthreads;
|
|
|
|
nthreads = MIN (base_config->num_processors, MAX_THREADS);
|
|
|
|
/* make sure we have at least one tile per thread */
|
|
nthreads = MIN (nthreads,
|
|
(p_s->PRI->region_width * p_s->PRI->region_height)
|
|
/ (TILE_WIDTH * TILE_HEIGHT));
|
|
|
|
if (nthreads > 1)
|
|
{
|
|
gint i;
|
|
pthread_t threads[MAX_THREADS];
|
|
pthread_attr_t pthread_attr;
|
|
|
|
pthread_attr_init (&pthread_attr);
|
|
|
|
for (i = 0; i < nthreads; i++)
|
|
{
|
|
pthread_create (&threads[i], &pthread_attr,
|
|
(void *(*)(void *)) do_parallel_regions,
|
|
p_s);
|
|
}
|
|
for (i = 0; i < nthreads; i++)
|
|
{
|
|
gint ret;
|
|
|
|
if ((ret = pthread_join(threads[i], NULL)))
|
|
{
|
|
g_printerr ("pixel_regions_do_parallel:: pthread_join returned: %d\n", ret);
|
|
}
|
|
}
|
|
if (p_s->nthreads != 0)
|
|
g_printerr ("pixel_regions_do_prarallel: we lost a thread\n");
|
|
}
|
|
else
|
|
)
|
|
do_parallel_regions_single (p_s);
|
|
}
|
|
|
|
static PixelProcessor *
|
|
pixel_regions_real_process_parallel (p_func f,
|
|
gpointer data,
|
|
ProgressReportFunc report_func,
|
|
gpointer report_data,
|
|
gint num_regions,
|
|
va_list ap)
|
|
{
|
|
gint i;
|
|
PixelProcessor *p_s;
|
|
|
|
p_s = g_new (PixelProcessor, 1);
|
|
|
|
for (i = 0; i < num_regions; i++)
|
|
p_s->r[i] = va_arg (ap, PixelRegion *);
|
|
|
|
switch(num_regions)
|
|
{
|
|
case 1:
|
|
p_s->PRI = pixel_regions_register (num_regions,
|
|
p_s->r[0]);
|
|
break;
|
|
|
|
case 2:
|
|
p_s->PRI = pixel_regions_register (num_regions,
|
|
p_s->r[0],
|
|
p_s->r[1]);
|
|
break;
|
|
|
|
case 3:
|
|
p_s->PRI = pixel_regions_register (num_regions,
|
|
p_s->r[0],
|
|
p_s->r[1],
|
|
p_s->r[2]);
|
|
break;
|
|
|
|
case 4:
|
|
p_s->PRI = pixel_regions_register (num_regions,
|
|
p_s->r[0],
|
|
p_s->r[1],
|
|
p_s->r[2],
|
|
p_s->r[3]);
|
|
break;
|
|
|
|
default:
|
|
g_message ("pixel_regions_real_process_parallel: Bad number of regions %d\n",
|
|
p_s->n_regions);
|
|
}
|
|
|
|
if (!p_s->PRI)
|
|
{
|
|
pixel_processor_free (p_s);
|
|
return NULL;
|
|
}
|
|
|
|
/* Why would we wan't to set dirty_tiles to 0 here? */
|
|
/* IF_THREAD(p_s->PRI->dirty_tiles = 0;) */
|
|
p_s->f = f;
|
|
p_s->data = data;
|
|
p_s->n_regions = num_regions;
|
|
IF_THREAD (pthread_mutex_init(&(p_s->mutex), NULL);)
|
|
p_s->nthreads = 0;
|
|
|
|
p_s->progress_report_data = report_data;
|
|
p_s->progress_report_func = report_func;
|
|
|
|
pixel_regions_do_parallel (p_s);
|
|
|
|
if (p_s->PRI)
|
|
return p_s;
|
|
|
|
pixel_processor_free (p_s);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
pixel_regions_process_parallel (p_func f,
|
|
gpointer data,
|
|
gint num_regions,
|
|
...)
|
|
{
|
|
va_list va;
|
|
|
|
va_start (va, num_regions);
|
|
|
|
pixel_regions_real_process_parallel (f, data, NULL, NULL, num_regions, va);
|
|
|
|
va_end (va);
|
|
}
|
|
|
|
PixelProcessor *
|
|
pixel_regions_process_parallel_progress (p_func f,
|
|
gpointer data,
|
|
ProgressReportFunc progress_func,
|
|
gpointer progress_data,
|
|
gint num_regions,
|
|
...)
|
|
{
|
|
PixelProcessor *ret;
|
|
va_list va;
|
|
|
|
va_start (va, num_regions);
|
|
|
|
ret = pixel_regions_real_process_parallel (f, data,
|
|
progress_func, progress_data,
|
|
num_regions, va);
|
|
|
|
va_end (va);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void
|
|
pixel_processor_stop (PixelProcessor *pp)
|
|
{
|
|
if (!pp)
|
|
return;
|
|
|
|
if (pp->PRI)
|
|
{
|
|
pixel_regions_process_stop (pp->PRI);
|
|
pp->PRI = NULL;
|
|
}
|
|
pixel_processor_free (pp);
|
|
}
|
|
|
|
PixelProcessor *
|
|
pixel_processor_cont (PixelProcessor *pp)
|
|
{
|
|
pixel_regions_do_parallel (pp);
|
|
|
|
if (pp->PRI)
|
|
return pp;
|
|
|
|
pixel_processor_free (pp);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
pixel_processor_free (PixelProcessor *pp)
|
|
{
|
|
if (pp->PRI)
|
|
pixel_processor_stop (pp);
|
|
else
|
|
g_free(pp);
|
|
}
|