86e4b1ef65
2000-05-10 Michael Natterer <mitch@gimp.org>
Another try to get the signal/dead child recovery stuff right.
Could the brave signal crew (TM) (Austin, Garry, Raphael, Tim)
please do bad tests to the new code? I removed all strange
constants (SA_NODEFER etc.) and used only glib and POSIX stuff.
* app/main.c
* libgimp/gimp.c:
- Call gimp_signal_private() with no flags to enforce a proper
sigaction() behaviour (block signals while handler is active).
- Removed the reentrancy guards from the handlers.
- Renamed the handlers.
- Ignore SIGPIPE in the app and in plugins.
- Re-introduced the SIGCHLD handler because it should work
now. Also added a SIGCHLD handler to libgimp/gimp.c.
* app/errors.c
* libgimp/gimp.c: in the signal handler, unblock all signals
with sigprocmask() before calling g_on_error_query() because
gdb otherwise inherits the blocked signals and does nothing.
Wrapped the statements with "if (TRUE) { }" blocks so it's
easy to make the stack trace a command line option.
* app/plug_in.c
* libgimp/gimp.c: listen for G_IO_ERR and G_IO_HUP on the read
channels. In the app, pop up an error message and clean up the
plugin. In plugins, clean up and exit.
* libgimp/gimpwire.c: removed the "plug-in chrashed?" message
and print the program's name with all error messages.
* plug-ins/helpbrowser/helpbrowser.c: typo.
135 lines
3 KiB
C
135 lines
3 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* 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"
|
|
|
|
#include <signal.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#ifdef HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_TIMES_H
|
|
#include <sys/times.h>
|
|
#endif
|
|
#include <sys/types.h>
|
|
#include <time.h>
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include <gtk/gtk.h>
|
|
#include "appenv.h"
|
|
#include "app_procs.h"
|
|
#include "errorconsole.h"
|
|
#include "errors.h"
|
|
#include "gimpui.h"
|
|
|
|
#ifdef G_OS_WIN32
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
extern gchar *prog_name;
|
|
|
|
void
|
|
gimp_message_func (gchar *str)
|
|
{
|
|
if (console_messages == FALSE)
|
|
switch (message_handler)
|
|
{
|
|
case MESSAGE_BOX:
|
|
gimp_message_box (str, NULL, NULL);
|
|
break;
|
|
|
|
case ERROR_CONSOLE:
|
|
error_console_add (str);
|
|
break;
|
|
|
|
default:
|
|
fprintf (stderr, "%s: %s\n", prog_name, str);
|
|
break;
|
|
}
|
|
else
|
|
fprintf (stderr, "%s: %s\n", prog_name, str);
|
|
}
|
|
|
|
void
|
|
gimp_fatal_error (gchar *fmt, ...)
|
|
{
|
|
#ifndef G_OS_WIN32
|
|
va_list args;
|
|
|
|
va_start (args, fmt);
|
|
g_print ("%s: fatal error: %s\n", prog_name, g_strdup_vprintf (fmt, args));
|
|
va_end (args);
|
|
|
|
if (TRUE)
|
|
{
|
|
sigset_t sigset;
|
|
|
|
sigemptyset (&sigset);
|
|
sigprocmask (SIG_SETMASK, &sigset, NULL);
|
|
g_on_error_query (prog_name);
|
|
}
|
|
#else
|
|
/* g_on_error_query doesn't do anything reasonable on Win32. */
|
|
va_list args;
|
|
gchar *msg;
|
|
|
|
va_start (args, fmt);
|
|
msg = g_strdup_vprintf (fmt, args);
|
|
va_end (args);
|
|
|
|
MessageBox (NULL, msg, prog_name, MB_OK|MB_ICONERROR);
|
|
/* I don't dare do anything more. */
|
|
ExitProcess (1);
|
|
#endif
|
|
app_exit (TRUE);
|
|
}
|
|
|
|
void
|
|
gimp_terminate (gchar *fmt, ...)
|
|
{
|
|
#ifndef G_OS_WIN32
|
|
va_list args;
|
|
|
|
va_start (args, fmt);
|
|
g_print ("%s terminated: %s\n", prog_name, g_strdup_vprintf (fmt, args));
|
|
va_end (args);
|
|
|
|
if (use_debug_handler)
|
|
{
|
|
sigset_t sigset;
|
|
|
|
sigemptyset (&sigset);
|
|
sigprocmask (SIG_SETMASK, &sigset, NULL);
|
|
g_on_error_query (prog_name);
|
|
}
|
|
#else
|
|
/* g_on_error_query doesn't do anything reasonable on Win32. */
|
|
va_list args;
|
|
gchar *msg;
|
|
|
|
va_start (args, fmt);
|
|
msg = g_strdup_vprintf (fmt, args);
|
|
va_end (args);
|
|
|
|
MessageBox (NULL, msg, prog_name, MB_OK|MB_ICONERROR);
|
|
#endif
|
|
gdk_exit (1);
|
|
}
|