Mercurial > hg > xemacs-beta
view src/vdb.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 | 5333f383efbd |
children | f395ee7ad844 |
line wrap: on
line source
/* Virtual diry bit implementation (platform independent) for XEmacs. Copyright (C) 2005 Marcus Crestani. 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 "gc.h" #include "mc-alloc.h" #include "vdb.h" typedef struct { Dynarr_declare (void *); } void_ptr_dynarr; void_ptr_dynarr *page_fault_table; /* Init page fault table and protect heap. */ void vdb_start_dirty_bits_recording (void) { Elemcount protected_pages = (Elemcount) protect_heap_pages (); page_fault_table = Dynarr_new2 (void_ptr_dynarr, void *); Dynarr_resize (page_fault_table, protected_pages); } /* Remove heap protection. */ void vdb_stop_dirty_bits_recording (void) { unprotect_heap_pages (); } /* Read page fault table and pass page faults to garbage collector. */ int vdb_read_dirty_bits (void) { int repushed_objects = 0; Elemcount count; for (count = Dynarr_length (page_fault_table); count; count--) repushed_objects += repush_all_objects_on_page (Dynarr_at (page_fault_table, count - 1)); Dynarr_free (page_fault_table); page_fault_table = 0; return repushed_objects; } /* Called by the page fault handler: add address to page fault table. */ void vdb_designate_modified (void *addr) { Dynarr_add (page_fault_table, addr); } /* For testing and debugging... */ DEFUN ("test-vdb", Ftest_vdb, 0, 0, "", /* Test virtual dirty bit implementation. Prints results to stderr. */ ()) { Rawbyte *p; char c; Elemcount count; /* Wrap up gc (if currently running). */ gc_full (); /* Allocate a buffer; it will have the default protection of PROT_READ|PROT_WRITE. */ p = (Rawbyte *) mc_alloc (mc_get_page_size()); set_lheader_implementation ((struct lrecord_header *) p, &lrecord_cons); fprintf (stderr, "Allocate p: [%p ... %p], length %d\n", p, p + mc_get_page_size (), (int) mc_get_page_size ()); /* Test read. */ fprintf (stderr, "Attempt to read p[666]... "); c = p[666]; fprintf (stderr, "read ok.\n"); /* Test write. */ fprintf (stderr, "Attempt to write 42 to p[666]... "); p[666] = 42; fprintf (stderr, "write ok, p[666] = %d\n", p[666]); /* Mark the buffer read-only and set environemnt for write-barrier. */ fprintf (stderr, "Write-protect the page.\n"); MARK_BLACK (p); vdb_start_dirty_bits_recording (); write_barrier_enabled = 1; /* Test write-barrier read. */ fprintf (stderr, "Attempt to read p[666]... "); c = p[666]; fprintf (stderr, "read ok.\n"); /* Test write-barrier write, program receives SIGSEGV. */ fprintf (stderr, "Attempt to write 23 to p[666]... "); p[666] = 23; fprintf (stderr, "Written p[666] = %d\n", p[666]); /* Stop write-barrier mode. */ write_barrier_enabled = 0; MARK_WHITE (p); vdb_unprotect (p, mc_get_page_size ()); for (count = Dynarr_length (page_fault_table); count; count--) if (Dynarr_at (page_fault_table, count - 1) == &p[666]) fprintf (stderr, "VALID page fault at %p\n", Dynarr_at (page_fault_table, count - 1)); else fprintf (stderr, "WRONG page fault at %p\n", Dynarr_at (page_fault_table, count - 1)); Dynarr_free (page_fault_table); return Qnil; } DEFUN ("test-segfault", Ftest_segfault, 0, 0, "", /* Test virtual dirty bit implementation: provoke a segfault on purpose. WARNING: this function causes a SEGFAULT on purpose and thus crashes XEmacs! This is only used for debbugging, e.g. for testing how the debugger behaves when XEmacs segfaults and the write barrier is enabled. */ ()) { Rawbyte *q = 0; q[0] = 23; return Qnil; } void syms_of_vdb (void) { DEFSUBR (Ftest_vdb); DEFSUBR (Ftest_segfault); }