Mercurial > hg > xemacs-beta
annotate src/vdb-posix.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | 896a34d28b71 |
| children | ed624ab64583 |
| rev | line source |
|---|---|
| 3092 | 1 /* Virtual diry bit implementation for XEmacs. |
| 2 Copyright (C) 2005 Marcus Crestani. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #include <config.h> | |
| 24 #include "lisp.h" | |
| 25 #include "gc.h" | |
| 26 #include "mc-alloc.h" | |
| 27 #include "vdb.h" | |
| 28 | |
| 29 #include <errno.h> | |
| 30 #include <signal.h> | |
| 31 #include <sys/mman.h> | |
| 32 | |
| 33 #if defined (HAVE_SIGACTION) | |
| 34 # if defined (HAVE_STRUCT_SIGINFO_SI_ADDR) | |
| 35 # define FAULT_HANDLER_ARGUMENTS \ | |
| 36 int signum, struct siginfo *siginfo, void *UNUSED (ctx) | |
| 37 # define GET_FAULT_ADDRESS siginfo->si_addr | |
| 38 # elif defined (HAVE_SIGINFO_T_SI_ADDR) | |
| 39 # define FAULT_HANDLER_ARGUMENTS \ | |
| 40 int signum, siginfo_t *siginfo, void *UNUSED (ctx) | |
| 41 # define GET_FAULT_ADDRESS siginfo->si_addr | |
| 42 # endif | |
| 43 # define USE_SIGACTION | |
| 44 # define FAULT_HANDLER_REMOVE_HANDLER | |
| 45 #elif defined (HAVE_SIGNAL) | |
| 46 # define FAULT_HANDLER_ARGUMENTS int signum, struct sigcontext sc | |
| 47 # define GET_FAULT_ADDRESS (void *) sc.cr2 | |
| 48 # define USE_SIGNAL | |
| 49 #endif | |
| 50 | |
| 51 | |
| 52 #ifdef USE_SIGACTION | |
| 53 struct sigaction act, segv_oact, bus_oact; | |
| 54 #endif /* USE_SIGACTION */ | |
| 55 | |
| 56 #ifdef USE_SIGNAL | |
| 57 sighandler_t segv_oact, bus_oact; | |
| 58 #endif /* USE_SIGNAL */ | |
| 59 | |
| 60 void vdb_remove_signal_handler (void); | |
| 61 | |
| 62 void | |
| 63 vdb_fault_handler (FAULT_HANDLER_ARGUMENTS) | |
| 64 { | |
| 65 if (write_barrier_enabled | |
| 66 && (fault_on_protected_page (GET_FAULT_ADDRESS))) | |
| 67 { | |
| 68 vdb_designate_modified (GET_FAULT_ADDRESS); | |
| 69 unprotect_page_and_mark_dirty (GET_FAULT_ADDRESS); | |
| 70 #ifdef FAULT_HANDLER_REINSTALL_HANDLER | |
| 71 vdb_install_signal_handler (); | |
| 72 #endif /* FAULT_HANDLER_REINSTALL_HANDLER */ | |
| 73 } | |
| 74 else /* default sigsegv handler */ | |
| 75 { | |
| 3462 | 76 char *signal_name = ""; |
| 3092 | 77 if (signum == SIGSEGV) |
| 78 signal_name = "SIGSEGV"; | |
| 79 else if (signum == SIGBUS) | |
| 80 signal_name = "SIGBUS"; | |
| 81 else | |
| 82 ABORT (); /* something weird happened: wrong signal caught */ | |
| 3519 | 83 fprintf (stderr, "\n\nFatal Error: Received %s (%d) for address %p\n", |
| 84 signal_name, signum, (void *) GET_FAULT_ADDRESS); | |
| 3092 | 85 #ifdef FAULT_HANDLER_CALL_PREVIOUS_HANDLER |
| 86 if (signum == SIGSEGV) | |
| 87 segv_oact (signum); | |
| 88 else if (signum == SIGBUS) | |
| 89 bus_oact (signum); | |
| 90 #endif /* FAULT_HANDLER_CALL_PREVIOUS_HANDLER */ | |
| 91 #ifdef FAULT_HANDLER_REMOVE_HANDLER | |
| 92 vdb_remove_signal_handler (); | |
| 93 #endif /* FAULT_HANDLER_REMOVE_HANDLER */ | |
| 94 } | |
| 95 } | |
| 96 | |
| 97 void | |
| 98 vdb_remove_signal_handler (void) | |
| 99 { | |
| 100 #ifdef USE_SIGACTION | |
| 101 sigaction(SIGSEGV, &segv_oact, 0); | |
| 102 sigaction(SIGBUS, &bus_oact, 0); | |
| 103 #endif /* USE_SIGACTION */ | |
| 104 #ifdef USE_SIGNAL | |
| 105 signal (SIGSEGV, segv_oact); | |
| 106 signal (SIGBUS, bus_oact); | |
| 107 #endif | |
| 108 } | |
| 109 | |
| 110 void | |
| 111 vdb_install_signal_handler (void) | |
| 112 { | |
| 113 /* See init_signals_very_early () in signal.c. */ | |
| 114 if (noninteractive && !initialized) | |
| 115 { | |
| 116 allow_incremental_gc = 0; | |
| 117 return; | |
| 118 } | |
| 119 | |
| 120 #ifdef USE_SIGACTION | |
| 3307 | 121 memset(&act, 0, sizeof(struct sigaction)); |
| 3092 | 122 act.sa_sigaction = vdb_fault_handler; |
| 123 sigemptyset (&act.sa_mask); | |
| 124 act.sa_flags = SA_SIGINFO; | |
| 125 sigaction (SIGSEGV, &act, &segv_oact); | |
| 126 sigaction (SIGBUS, &act, &bus_oact); | |
| 127 allow_incremental_gc = 1; | |
| 128 #endif /* USE_SIGACTION */ | |
| 129 #ifdef USE_SIGNAL | |
| 130 segv_oact = signal (SIGSEGV, (void (*)(int)) vdb_fault_handler); | |
| 131 bus_oact = signal (SIGBUS, (void (*)(int)) vdb_fault_handler); | |
| 132 #endif /* USE_SIGNAL */ | |
| 133 } | |
| 134 | |
| 135 void | |
| 136 vdb_protect (void *ptr, EMACS_INT len) | |
| 137 { | |
| 138 if (mprotect (ptr, len, PROT_READ)) | |
| 139 { | |
| 140 perror ("Couldn't mprotect"); | |
| 141 ABORT (); | |
| 142 } | |
| 143 } | |
| 144 | |
| 145 void | |
| 146 vdb_unprotect (void *ptr, EMACS_INT len) | |
| 147 { | |
| 148 if (mprotect (ptr, len, PROT_READ | PROT_WRITE)) | |
| 149 { | |
| 150 perror ("Couldn't mprotect"); | |
| 151 ABORT (); | |
| 152 } | |
| 153 } |