dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

loop around select() as long as it returns EINTR. Enables debugging of 

2007-09-29  Michael Natterer  <mitch@gimp.org>

	* libgimp/gimp.c (gimp_extension_process): loop around select() as
	long as it returns EINTR. Enables debugging of script-fu on
	OSX (and maybe all BSDish systems).


svn path=/trunk/; revision=23686
This commit is contained in:
Michael Natterer 2007-09-29 10:13:48 +00:00 committed by Michael Natterer
parent 4c0b47c34d
commit 26745bf519
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-09-29 Michael Natterer <mitch@gimp.org>
* libgimp/gimp.c (gimp_extension_process): loop around select() as
long as it returns EINTR. Enables debugging of script-fu on
OSX (and maybe all BSDish systems).
2007-09-28 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/script-fu-console.c: allocate the

47
libgimp/gimp.c
View File

@ -1339,32 +1339,37 @@ void
gimp_extension_process (guint timeout)
{
#ifndef G_OS_WIN32
fd_set readfds;
gint select_val;
struct timeval tv;
struct timeval *tvp;
gint select_val;
if (timeout)
do
{
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000) * 1000;
tvp = &tv;
}
else
tvp = NULL;
fd_set readfds;
struct timeval tv;
struct timeval *tvp;
FD_ZERO (&readfds);
FD_SET (g_io_channel_unix_get_fd (_readchannel), &readfds);
if (timeout)
{
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000) * 1000;
tvp = &tv;
}
else
tvp = NULL;
if ((select_val = select (FD_SETSIZE, &readfds, NULL, NULL, tvp)) > 0)
{
gimp_single_message ();
}
else if (select_val == -1)
{
perror ("gimp_extension_process");
gimp_quit ();
FD_ZERO (&readfds);
FD_SET (g_io_channel_unix_get_fd (_readchannel), &readfds);
if ((select_val = select (FD_SETSIZE, &readfds, NULL, NULL, tvp)) > 0)
{
gimp_single_message ();
}
else if (select_val == -1 && errno != EINTR)
{
perror ("gimp_extension_process");
gimp_quit ();
}
}
while (select_val == -1 && errno == EINTR);
#else
/* Zero means infinite wait for us, but g_poll and
* g_io_channel_win32_poll use -1 to indicate