mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-31 17:30:54 -08:00
This replaces macros (which typically do not work in GDB) with functions, typedefs and enums, making the code easier to debug. The functional style also makes code easier to read and maintain. * lib-src/profile.c (TV2): Remove no-longer-needed static var. * src/systime.h: Include <sys/time.h> on all hosts, not just if WINDOWSNT, since 'struct timeval' is needed in general. (EMACS_TIME): Now a typedef, not a macro. (EMACS_TIME_RESOLUTION, LOG10_EMACS_TIME_RESOLUTION): Now constants, not macros. (EMACS_SECS, EMACS_NSECS, EMACS_TIME_SIGN, EMACS_TIME_VALID_P) (EMACS_TIME_FROM_DOUBLE, EMACS_TIME_TO_DOUBLE, EMACS_TIME_EQ) (EMACS_TIME_NE, EMACS_TIME_GT, EMACS_TIME_GE, EMACS_TIME_LT) (EMACS_TIME_LE): Now functions, not macros. (EMACS_SET_SECS, EMACS_SET_NSECS, EMACS_SET_SECS_NSECS) (EMACS_SET_USECS, EMACS_SET_SECS_USECS): Remove these macros, which are not functions. All uses rewritten to use: (make_emacs_time): New function. (EMACS_SECS_ADDR, EMACS_SET_INVALID_TIME, EMACS_GET_TIME) (EMACS_ADD_TIME, EMACS_SUB_TIME): Remove these macros, which are not functions. All uses rewritten to use the following, respectively: (emacs_secs_addr, invalid_emacs_time, get_emacs_time) (add_emacs_time, sub_emacs_time): New functions. * src/atimer.c: Don't include <sys/time.h>, as "systime.h" does this. * src/fileio.c (Fcopy_file): * src/xterm.c (XTflash): Get the current time closer to when it's used. * src/makefile.w32-in ($(BLD)/atimer.$(O)): Update dependencies.
158 lines
4.1 KiB
C
158 lines
4.1 KiB
C
/* Function for handling the GLib event loop.
|
|
|
|
Copyright (C) 2009-2012 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
GNU Emacs 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 GNU Emacs. If not, see <http§://www.gnu.org/licenses/>. */
|
|
|
|
#include <config.h>
|
|
|
|
#include <setjmp.h>
|
|
#include "xgselect.h"
|
|
|
|
#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
|
|
|
|
#include <glib.h>
|
|
#include <errno.h>
|
|
#include <setjmp.h>
|
|
#include "xterm.h"
|
|
|
|
static GPollFD *gfds;
|
|
static ptrdiff_t gfds_size;
|
|
|
|
int
|
|
xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
|
|
EMACS_TIME *timeout, sigset_t *sigmask)
|
|
{
|
|
SELECT_TYPE all_rfds, all_wfds;
|
|
EMACS_TIME tmo, *tmop = timeout;
|
|
|
|
GMainContext *context;
|
|
int have_wfds = wfds != NULL;
|
|
int n_gfds = 0, retval = 0, our_fds = 0, max_fds = fds_lim - 1;
|
|
int i, nfds, tmo_in_millisec;
|
|
|
|
if (!x_in_use)
|
|
return pselect (fds_lim, rfds, wfds, efds, tmop, sigmask);
|
|
|
|
if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));
|
|
else FD_ZERO (&all_rfds);
|
|
if (wfds) memcpy (&all_wfds, wfds, sizeof (all_rfds));
|
|
else FD_ZERO (&all_wfds);
|
|
|
|
/* Update event sources in GLib. */
|
|
context = g_main_context_default ();
|
|
g_main_context_pending (context);
|
|
|
|
do {
|
|
if (n_gfds > gfds_size)
|
|
{
|
|
xfree (gfds);
|
|
gfds = xpalloc (0, &gfds_size, n_gfds - gfds_size, INT_MAX,
|
|
sizeof *gfds);
|
|
}
|
|
|
|
n_gfds = g_main_context_query (context,
|
|
G_PRIORITY_LOW,
|
|
&tmo_in_millisec,
|
|
gfds,
|
|
gfds_size);
|
|
} while (n_gfds > gfds_size);
|
|
|
|
for (i = 0; i < n_gfds; ++i)
|
|
{
|
|
if (gfds[i].events & G_IO_IN)
|
|
{
|
|
FD_SET (gfds[i].fd, &all_rfds);
|
|
if (gfds[i].fd > max_fds) max_fds = gfds[i].fd;
|
|
}
|
|
if (gfds[i].events & G_IO_OUT)
|
|
{
|
|
FD_SET (gfds[i].fd, &all_wfds);
|
|
if (gfds[i].fd > max_fds) max_fds = gfds[i].fd;
|
|
have_wfds = 1;
|
|
}
|
|
}
|
|
|
|
if (tmo_in_millisec >= 0)
|
|
{
|
|
tmo = make_emacs_time (tmo_in_millisec / 1000,
|
|
1000 * 1000 * (tmo_in_millisec % 1000));
|
|
if (!timeout || EMACS_TIME_LT (tmo, *timeout))
|
|
tmop = &tmo;
|
|
}
|
|
|
|
fds_lim = max_fds + 1;
|
|
nfds = pselect (fds_lim, &all_rfds, have_wfds ? &all_wfds : NULL,
|
|
efds, tmop, sigmask);
|
|
|
|
if (nfds < 0)
|
|
retval = nfds;
|
|
else if (nfds > 0)
|
|
{
|
|
for (i = 0; i < fds_lim; ++i)
|
|
{
|
|
if (FD_ISSET (i, &all_rfds))
|
|
{
|
|
if (rfds && FD_ISSET (i, rfds)) ++retval;
|
|
else ++our_fds;
|
|
}
|
|
else if (rfds)
|
|
FD_CLR (i, rfds);
|
|
|
|
if (have_wfds && FD_ISSET (i, &all_wfds))
|
|
{
|
|
if (wfds && FD_ISSET (i, wfds)) ++retval;
|
|
else ++our_fds;
|
|
}
|
|
else if (wfds)
|
|
FD_CLR (i, wfds);
|
|
|
|
if (efds && FD_ISSET (i, efds))
|
|
++retval;
|
|
}
|
|
}
|
|
|
|
if (our_fds > 0 || (nfds == 0 && tmop == &tmo))
|
|
{
|
|
|
|
/* If Gtk+ is in use eventually gtk_main_iteration will be called,
|
|
unless retval is zero. */
|
|
#ifdef USE_GTK
|
|
if (retval == 0)
|
|
#endif
|
|
while (g_main_context_pending (context))
|
|
g_main_context_dispatch (context);
|
|
|
|
/* To not have to recalculate timeout, return like this. */
|
|
if (retval == 0)
|
|
{
|
|
retval = -1;
|
|
errno = EINTR;
|
|
}
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
#endif /* USE_GTK || HAVE_GCONF || HAVE_GSETTINGS */
|
|
|
|
void
|
|
xgselect_initialize (void)
|
|
{
|
|
#if defined (USE_GTK) || defined (HAVE_GCONF) || defined (HAVE_GSETTINGS)
|
|
gfds_size = 128;
|
|
gfds = xmalloc (gfds_size * sizeof *gfds);
|
|
#endif
|
|
}
|