HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/insdel.c (prepare_to_modify_buffer_1): Cancel lock-file checks and
[bpt/emacs.git]
/
src
/
xgselect.c
diff --git
a/src/xgselect.c
b/src/xgselect.c
index
45a34f2
..
5f71ff8
100644
(file)
--- a/
src/xgselect.c
+++ b/
src/xgselect.c
@@
-1,6
+1,6
@@
/* Function for handling the GLib event loop.
/* Function for handling the GLib event loop.
-Copyright (C) 2009-201
3
Free Software Foundation, Inc.
+Copyright (C) 2009-201
4
Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-25,14
+25,15
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <glib.h>
#include <errno.h>
#include <glib.h>
#include <errno.h>
+#include <stdbool.h>
#include <timespec.h>
#include "frame.h"
int
#include <timespec.h>
#include "frame.h"
int
-xg_select (int fds_lim,
SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE
*efds,
+xg_select (int fds_lim,
fd_set *rfds, fd_set *wfds, fd_set
*efds,
struct timespec const *timeout, sigset_t const *sigmask)
{
struct timespec const *timeout, sigset_t const *sigmask)
{
-
SELECT_TYPE
all_rfds, all_wfds;
+
fd_set
all_rfds, all_wfds;
struct timespec tmo;
struct timespec const *tmop = timeout;
struct timespec tmo;
struct timespec const *tmop = timeout;
@@
-40,9
+41,10
@@
xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
int have_wfds = wfds != NULL;
GPollFD gfds_buf[128];
GPollFD *gfds = gfds_buf;
int have_wfds = wfds != NULL;
GPollFD gfds_buf[128];
GPollFD *gfds = gfds_buf;
- int gfds_size =
sizeof gfds_buf / sizeof *gfds_buf
;
+ int gfds_size =
ARRAYELTS (gfds_buf)
;
int n_gfds, retval = 0, our_fds = 0, max_fds = fds_lim - 1;
int i, nfds, tmo_in_millisec;
int n_gfds, retval = 0, our_fds = 0, max_fds = fds_lim - 1;
int i, nfds, tmo_in_millisec;
+ bool need_to_dispatch;
USE_SAFE_ALLOCA;
/* Do not try to optimize with an initial check with g_main_context_pending
USE_SAFE_ALLOCA;
/* Do not try to optimize with an initial check with g_main_context_pending
@@
-124,23
+126,26
@@
xg_select (int fds_lim, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
}
}
}
}
- if (our_fds > 0 || (nfds == 0 && tmop == &tmo))
- {
-
- /* If Gtk+ is in use eventually gtk_main_iteration will be called,
- unless retval is zero. */
+ /* If Gtk+ is in use eventually gtk_main_iteration will be called,
+ unless retval is zero. */
#ifdef USE_GTK
#ifdef USE_GTK
- if (retval == 0)
+ need_to_dispatch = retval == 0;
+#else
+ need_to_dispatch = true;
#endif
#endif
- while (g_main_context_pending (context))
- g_main_context_dispatch (context);
+ if (need_to_dispatch)
+ {
+ int pselect_errno = errno;
+ while (g_main_context_pending (context))
+ g_main_context_dispatch (context);
+ errno = pselect_errno;
+ }
- /* To not have to recalculate timeout, return like this. */
- if (retval == 0)
- {
- retval = -1;
- errno = EINTR;
- }
+ /* To not have to recalculate timeout, return like this. */
+ if ((our_fds > 0 || (nfds == 0 && tmop == &tmo)) && (retval == 0))
+ {
+ retval = -1;
+ errno = EINTR;
}
return retval;
}
return retval;