Mercurial > hg > xemacs-beta
view src/event-tty.c @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | 0c544f2f566c |
children | 308d34e9f07d |
line wrap: on
line source
/* The event_stream interface for tty's. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 2002, 2003 Ben Wing. This file is part of XEmacs. XEmacs 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, or (at your option) any later version. XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "device.h" #include "console-tty-impl.h" #include "events.h" #include "frame.h" #include "process.h" #include "sysproc.h" #include "syswait.h" #include "systime.h" /* Mask of bits indicating the descriptors that we wait for input on */ extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; extern SELECT_TYPE process_only_mask, tty_only_mask; static struct event_stream *tty_event_stream; #ifdef WIN32_ANY extern int mswindows_is_blocking; #endif static int last_quit_check_signal_tick_count; /************************************************************************/ /* timeout events */ /************************************************************************/ /* The pending timers are stored in an ordered list, where the first timer on the list is the first one to fire. Times recorded here are absolute. */ static struct low_level_timeout *tty_timer_queue; static int emacs_tty_add_timeout (EMACS_TIME thyme) { return add_low_level_timeout (&tty_timer_queue, thyme); } static void emacs_tty_remove_timeout (int id) { remove_low_level_timeout (&tty_timer_queue, id); } static void tty_timeout_to_emacs_event (Lisp_Event *emacs_event) { /* timeout events have nil as channel */ SET_EVENT_TYPE (emacs_event, timeout_event); SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */ SET_EVENT_TIMEOUT_INTERVAL_ID (emacs_event, pop_low_level_timeout (&tty_timer_queue, 0)); SET_EVENT_TIMEOUT_FUNCTION (emacs_event, Qnil); SET_EVENT_TIMEOUT_OBJECT (emacs_event, Qnil); } static int emacs_tty_event_pending_p (int how_many) { Lisp_Object event; int tick_count_val; /* Cf. the comments on emacs_Xt_event_pending_p in event-xlike-inc.c . */ if (!how_many) { EMACS_TIME sometime; /* (1) Any pending events in the dispatch queue? */ if (!NILP(dispatch_event_queue)) { return 1; } /* (2) Any TTY or process input available? */ if (poll_fds_for_input (non_fake_input_wait_mask)) return 1; /* (3) Any timeout input available? */ EMACS_GET_TIME (sometime); if (tty_timer_queue && EMACS_TIME_EQUAL_OR_GREATER (sometime, tty_timer_queue->time)) return 1; } else { /* HOW_MANY > 0 */ EVENT_CHAIN_LOOP (event, dispatch_event_queue) { if (command_event_p (event)) { how_many--; if (how_many <= 0) return 1; } } } tick_count_val = quit_check_signal_tick_count; /* Checking in_modal_loop here is a bit cargo-cultish, since its use is specific to builds with a window system. */ if (!in_modal_loop && (last_quit_check_signal_tick_count != tick_count_val)) { last_quit_check_signal_tick_count = tick_count_val; /* We need to drain the entire queue now -- if we only drain part of it, we may later on end up with events actually pending but detect_input_pending() returning false because there wasn't another SIGIO. */ event_stream_drain_queue (); if (!how_many) return !NILP (dispatch_event_queue); EVENT_CHAIN_LOOP (event, dispatch_event_queue) { if (command_event_p (event)) { how_many--; if (how_many <= 0) return 1; } } } return 0; } static void emacs_tty_next_event (Lisp_Event *emacs_event) { while (1) { int ndesc; int i; SELECT_TYPE temp_mask = input_wait_mask; EMACS_TIME time_to_block; EMACS_SELECT_TIME select_time_to_block, *pointer_to_this; if (!NILP (dispatch_event_queue)) { Lisp_Object event, event2; event2 = wrap_event (emacs_event); event = dequeue_dispatch_event (); Fcopy_event (event, event2); Fdeallocate_event (event); return; } if (!get_low_level_timeout_interval (tty_timer_queue, &time_to_block)) /* no timer events; block indefinitely */ pointer_to_this = 0; else { EMACS_TIME_TO_SELECT_TIME (time_to_block, select_time_to_block); pointer_to_this = &select_time_to_block; } #ifdef WIN32_ANY mswindows_is_blocking = 1; #endif ndesc = select (MAXDESC, &temp_mask, 0, 0, pointer_to_this); #ifdef WIN32_ANY mswindows_is_blocking = 0; #endif if (ndesc > 0) { /* Look for a TTY event */ for (i = 0; i < MAXDESC; i++) { /* To avoid race conditions (among other things, an infinite loop when called from Fdiscard_input()), we must return user events ahead of process events. */ if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &tty_only_mask)) { struct console *c = find_tty_or_stream_console_from_fd (i); assert (c); if (read_event_from_tty_or_stream_desc (emacs_event, c)) return; } } /* Look for a process event */ for (i = 0; i < MAXDESC; i++) { if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &process_only_mask)) { Lisp_Object process; Lisp_Process *p = get_process_from_usid (FD_TO_USID(i)); assert (p); process = wrap_process (p); set_event_type (emacs_event, process_event); /* process events have nil as channel */ SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */ SET_EVENT_PROCESS_PROCESS (emacs_event, process); return; } } /* We might get here when a fake event came through a signal. */ /* Return a dummy event, so that a cycle of the command loop will occur. */ drain_signal_event_pipe (); set_event_type (emacs_event, eval_event); /* eval events have nil as channel */ SET_EVENT_EVAL_FUNCTION (emacs_event, Qidentity); SET_EVENT_EVAL_OBJECT (emacs_event, Qnil); return; } else if (ndesc == 0) /* timeout fired */ { tty_timeout_to_emacs_event (emacs_event); return; } } } static void emacs_tty_format_magic_event (Lisp_Event *UNUSED (emacs_event), Lisp_Object UNUSED (pstream)) { /* Nothing to do currently */ } static int emacs_tty_compare_magic_event (Lisp_Event *UNUSED (e1), Lisp_Event *UNUSED (e2)) { return 1; } static Hashcode emacs_tty_hash_magic_event (Lisp_Event *UNUSED (e)) { return 0; } static void emacs_tty_handle_magic_event (Lisp_Event *UNUSED (emacs_event)) { /* Nothing to do currently */ } static void emacs_tty_select_process (Lisp_Process *process, int doin, int doerr) { int infd, errfd; event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd); } static void emacs_tty_unselect_process (Lisp_Process *process, int doin, int doerr) { int infd, errfd; event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd); } static void emacs_tty_select_console (struct console *con) { event_stream_unixoid_select_console (con); } static void emacs_tty_unselect_console (struct console *con) { event_stream_unixoid_unselect_console (con); } static void emacs_tty_drain_queue (void) { drain_tty_devices (); } static void emacs_tty_create_io_streams (void* inhandle, void* outhandle, void *errhandle, Lisp_Object* instream, Lisp_Object* outstream, Lisp_Object* errstream, USID* in_usid, USID* err_usid, int flags) { event_stream_unixoid_create_io_streams (inhandle, outhandle, errhandle, instream, outstream, errstream, in_usid, err_usid, flags); } static void emacs_tty_delete_io_streams (Lisp_Object instream, Lisp_Object outstream, Lisp_Object errstream, USID* in_usid, USID* err_usid) { event_stream_unixoid_delete_io_streams (instream, outstream, errstream, in_usid, err_usid); } /************************************************************************/ /* initialization */ /************************************************************************/ void reinit_vars_of_event_tty (void) { tty_event_stream = xnew_and_zero (struct event_stream); tty_event_stream->event_pending_p = emacs_tty_event_pending_p; tty_event_stream->next_event_cb = emacs_tty_next_event; tty_event_stream->handle_magic_event_cb = emacs_tty_handle_magic_event; tty_event_stream->format_magic_event_cb = emacs_tty_format_magic_event; tty_event_stream->compare_magic_event_cb= emacs_tty_compare_magic_event; tty_event_stream->hash_magic_event_cb = emacs_tty_hash_magic_event; tty_event_stream->add_timeout_cb = emacs_tty_add_timeout; tty_event_stream->remove_timeout_cb = emacs_tty_remove_timeout; tty_event_stream->select_console_cb = emacs_tty_select_console; tty_event_stream->unselect_console_cb = emacs_tty_unselect_console; tty_event_stream->select_process_cb = emacs_tty_select_process; tty_event_stream->unselect_process_cb = emacs_tty_unselect_process; tty_event_stream->drain_queue_cb = emacs_tty_drain_queue; tty_event_stream->create_io_streams_cb = emacs_tty_create_io_streams; tty_event_stream->delete_io_streams_cb = emacs_tty_delete_io_streams; last_quit_check_signal_tick_count = 0; } void vars_of_event_tty (void) { } void init_event_tty_late (void) { event_stream = tty_event_stream; }