Mercurial > hg > xemacs-beta
view src/event-unixoid.c @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 16 Aug 2009 20:55:49 +0100 |
parents | 0cc7794d231e |
children | 2fd201d73a92 |
line wrap: on
line source
/* Code shared between all event loops that use select() and have a different input descriptor for each device. Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 1996, 2001, 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. */ /* This file has been Mule-ized. */ #include <config.h> #include "lisp.h" #include "console-stream-impl.h" #include "console-tty-impl.h" #include "device-impl.h" #include "events.h" #include "lstream.h" #include "process.h" #include "sysdep.h" #include "sysfile.h" #include "sysproc.h" /* select stuff */ #include "systime.h" /* Mask of bits indicating the descriptors that we wait for input on. These work as follows: In event-tty.c we call select() directly on this to retrieve an event. In event-Xt.c we use XtAppAddInput() and the call to select() is down in the guts of Xt, but we still use the masks when checking for pending input, even in event-Xt.c. (We can't use XtAppPending() because of the presence of the signal event pipe.) input_wait_mask == mask of all file descriptors we select() on, including TTY/stream console descriptors, process descriptors, and the signal event pipe. non_fake_input_wait_mask == same as input_wait_mask but minus the signal event pipe. Also only used in event-tty.c. process_only_mask == only the process descriptors. tty_only_mask == only the TTY/stream console descriptors. */ SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; SELECT_TYPE process_only_mask, tty_only_mask; /* This is used to terminate the select(), when an event came in through a signal (e.g. window-change or C-g on controlling TTY). */ int signal_event_pipe[2]; int signal_event_pipe_initialized; int fake_event_occurred; struct console * find_tty_or_stream_console_from_fd (int fd) { Lisp_Object concons; CONSOLE_LOOP (concons) { struct console *c; c = XCONSOLE (XCAR (concons)); if ((CONSOLE_TTY_P (c) && CONSOLE_TTY_DATA (c)->infd == fd) || (CONSOLE_STREAM_P (c) && fileno (CONSOLE_STREAM_DATA (c)->in) == fd)) return c; } return 0; } int read_event_from_tty_or_stream_desc (Lisp_Event *event, struct console *con) { Ichar ch; Lisp_Object console = wrap_console (con); if (CONSOLE_TTY_P (con)) ch = Lstream_get_ichar (XLSTREAM (CONSOLE_TTY_DATA (con)->instream)); else { /* #### Definitely something strange here. We should be setting the stdio handle unbuffered and reading from it instead of mixing stdio and raw io calls. */ int nread = retry_read (fileno (CONSOLE_STREAM_DATA (con)->in), &ch, 1); if (nread <= 0) ch = -1; } if (ch < 0) { /* deleting the console might not be safe right now ... */ enqueue_magic_eval_event (io_error_delete_console, console); /* but we definitely need to unselect it to avoid infinite loops reading EOF's */ Fconsole_disable_input (console); } else { /* Here we really do want to set the use_console_meta_flag because the char is from the TTY. */ character_to_event (ch, event, con, 1, 1); event->channel = console; return 1; } return 0; } void signal_fake_event (void) { char byte = 0; /* We do the write always. Formerly I tried to "optimize" this by setting a flag indicating whether we're blocking and only doing the write in that case, but there is a race condition if the signal occurs after we've checked for the signal occurrence (which could occur in many places throughout an iteration of the command loop, e.g. in status_notify()), but before we set the blocking flag. This should be OK as long as write() is reentrant, which I'm fairly sure it is since it's a system call. */ if (signal_event_pipe_initialized) /* In case a signal comes through while we're dumping */ { int old_errno = errno; retry_write (signal_event_pipe[1], &byte, 1); errno = old_errno; } } void drain_signal_event_pipe (void) { char chars[128]; /* The input end of the pipe has been set to non-blocking. */ while (retry_read (signal_event_pipe[0], chars, sizeof (chars)) > 0) ; } void drain_tty_devices (void) { Lisp_Object devcons, concons; CONSOLE_LOOP (concons) { struct console *con = XCONSOLE (XCAR (concons)); if (!con->input_enabled) continue; CONSOLE_DEVICE_LOOP (devcons, con) { struct device *d = XDEVICE (XCAR (devcons)); if (DEVICE_TTY_P (d)) { SELECT_TYPE temp_mask; int infd = DEVICE_INFD (d); FD_ZERO (&temp_mask); FD_SET (infd, &temp_mask); while (1) { Lisp_Object event; if (!poll_fds_for_input (temp_mask)) break; event = Fmake_event (Qnil, Qnil); if (!read_event_from_tty_or_stream_desc (XEVENT (event), con)) /* EOF, or something ... */ break; /* queue the read event to be read for real later. */ enqueue_dispatch_event (event); } } } } } int event_stream_unixoid_select_console (struct console *con) { int infd; if (CONSOLE_STREAM_P (con)) infd = fileno (CONSOLE_STREAM_DATA (con)->in); else { assert (CONSOLE_TTY_P (con)); infd = CONSOLE_TTY_DATA (con)->infd; } assert (infd >= 0); FD_SET (infd, &input_wait_mask); FD_SET (infd, &non_fake_input_wait_mask); FD_SET (infd, &tty_only_mask); return infd; } int event_stream_unixoid_unselect_console (struct console *con) { int infd; if (CONSOLE_STREAM_P (con)) infd = fileno (CONSOLE_STREAM_DATA (con)->in); else { assert (CONSOLE_TTY_P (con)); infd = CONSOLE_TTY_DATA (con)->infd; } assert (infd >= 0); FD_CLR (infd, &input_wait_mask); FD_CLR (infd, &non_fake_input_wait_mask); FD_CLR (infd, &tty_only_mask); return infd; } static int get_process_infd (Lisp_Process *p) { Lisp_Object instr, outstr, errstr; get_process_streams (p, &instr, &outstr, &errstr); assert (!NILP (instr)); return filedesc_stream_fd (XLSTREAM (instr)); } static int get_process_errfd (Lisp_Process *p) { Lisp_Object instr, outstr, errstr; get_process_streams (p, &instr, &outstr, &errstr); if (!NILP (errstr)) return filedesc_stream_fd (XLSTREAM (errstr)); else return -1; } void event_stream_unixoid_select_process (Lisp_Process *proc, int doin, int doerr, int *infd, int *errfd) { if (doin) { *infd = get_process_infd (proc); FD_SET (*infd, &input_wait_mask); FD_SET (*infd, &non_fake_input_wait_mask); FD_SET (*infd, &process_only_mask); } if (doerr) { *errfd = get_process_errfd (proc); if (*errfd >= 0) { FD_SET (*errfd, &input_wait_mask); FD_SET (*errfd, &non_fake_input_wait_mask); FD_SET (*errfd, &process_only_mask); } } } void event_stream_unixoid_unselect_process (Lisp_Process *proc, int doin, int doerr, int *infd, int *errfd) { if (doin) { *infd = get_process_infd (proc); FD_CLR (*infd, &input_wait_mask); FD_CLR (*infd, &non_fake_input_wait_mask); FD_CLR (*infd, &process_only_mask); } if (doerr) { *errfd = get_process_errfd (proc); if (*errfd >= 0) { FD_CLR (*errfd, &input_wait_mask); FD_CLR (*errfd, &non_fake_input_wait_mask); FD_CLR (*errfd, &process_only_mask); } } } int poll_fds_for_input (SELECT_TYPE mask) { EMACS_TIME sometime; EMACS_SELECT_TIME select_time; SELECT_TYPE temp_mask; int retval; while (1) { EMACS_SET_SECS_USECS (sometime, 0, 0); EMACS_TIME_TO_SELECT_TIME (sometime, select_time); temp_mask = mask; /* To effect a poll, tell select() to block for zero seconds. */ retval = select (MAXDESC, &temp_mask, 0, 0, &select_time); if (retval >= 0) return retval; if (errno != EINTR) { /* Something went seriously wrong; don't abort since maybe the TTY just died at the wrong time. */ stderr_out ("xemacs: select failed: errno = %d\n", errno); return 0; } /* else, we got interrupted by a signal, so try again. */ } RETURN_NOT_REACHED (0); } /****************************************************************************/ /* Unixoid (file descriptors based) process I/O streams routines */ /****************************************************************************/ void event_stream_unixoid_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) { int infd, outfd, errfd; /* Decode inhandle and outhandle. Their meaning depends on the process implementation being used. */ /* We are passed plain old file descs, which are ints, so */ /* if sizeof(EMACS_INT) > sizeof(int) it's OK. */ infd = (EMACS_INT) inhandle; outfd = (EMACS_INT) outhandle; errfd = (EMACS_INT) errhandle; *instream = (infd >= 0 ? make_filedesc_input_stream (infd, 0, -1, 0) : Qnil); *outstream = (outfd >= 0 ? make_filedesc_output_stream (outfd, 0, -1, LSTR_BLOCKED_OK) : Qnil); *errstream = (errfd >= 0 ? make_filedesc_input_stream (errfd, 0, -1, 0) : Qnil); /* FLAGS is process->pty_flag for UNIX_PROCESSES */ if ((flags & STREAM_PTY_FLUSHING) && outfd >= 0) { Ibyte eof_char = get_eof_char (outfd); int pty_max_bytes = get_pty_max_bytes (outfd); filedesc_stream_set_pty_flushing (XLSTREAM (*outstream), pty_max_bytes, eof_char); } *in_usid = FD_TO_USID (infd); *err_usid = FD_TO_USID (errfd); } void event_stream_unixoid_delete_io_streams (Lisp_Object instream, Lisp_Object outstream, Lisp_Object errstream, USID *in_usid, USID *err_usid) { int in = (NILP (instream) ? -1 : filedesc_stream_fd (XLSTREAM (instream))); int out = (NILP (outstream) ? -1 : filedesc_stream_fd (XLSTREAM (outstream))); int err = (NILP (errstream) ? -1 : filedesc_stream_fd (XLSTREAM (errstream))); if (in >= 0) retry_close (in); if (out != in && out >= 0) retry_close (out); if (err != in && err != out && err >= 0) retry_close (err); *in_usid = FD_TO_USID (in); *err_usid = FD_TO_USID (err); } void init_event_unixoid (void) { /* Do this first; the init_event_*_late() functions pay attention to it. */ if (pipe (signal_event_pipe) < 0) { perror ("XEmacs: can't open pipe"); exit (-1); } signal_event_pipe_initialized = 1; /* Set it non-blocking so we can drain its output. */ set_descriptor_non_blocking (signal_event_pipe[0]); /* Also set the write descriptor non-blocking so we don't hang in case a long time passes between times when we drain the pipe. */ set_descriptor_non_blocking (signal_event_pipe[1]); /* WARNING: In order for the signal-event pipe to work correctly and not cause lockups, the following need to be followed: 1) event_pending_p() must ignore input on the signal-event pipe. 2) As soon as next_event() notices input on the signal-event pipe, it must drain it. */ FD_ZERO (&input_wait_mask); FD_ZERO (&non_fake_input_wait_mask); FD_ZERO (&process_only_mask); FD_ZERO (&tty_only_mask); FD_SET (signal_event_pipe[0], &input_wait_mask); }