mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-24 22:07:36 +00:00
Add a new portable dumper as an alternative to unexec. Use it by default. * src/dmpstruct.awk: New file. * src/doc.c (get_doc_string): use will_dump_p(). * src/editfns.c (styled_format): silence compiler warning with UNINIT. * src/emacs-module.c (syms_of_module): staticpro ltv_mark. * src/emacs.c (gflags): new variable. (init_cmdargs): unwrap (string_starts_with_p, find_argument, dump_error_to_string) (load_pdump): new functions. (main): detect pdumper and --temacs invocation; actually load portable dump when detected; set gflags as appropriate; changes to init functions throughout to avoid passing explicit 'initialized' argument. * src/eval.c (inhibit_lisp_code): remove unused variable. (init_eval_once_for_pdumper): new function. (init_eval_once): call it. * src/filelock.c: CANNOT_DUMP -> will_dump_p() * src/fingerprint-dummy.c: new file * src/fingerprint.h: new file * src/fns.c: CANNOT_DUMP -> will_dump_p(), etc. (weak_hash_tables): remove (hashfn_equal, hashfn_eql): un-staticify (make_hash_table): set new 'next_weak' hash table field; drop global weak_hash_tables logic. (copy_hash_table): drop global weak_hash_tables logic. (hash_table_rehash): new function. (hash_lookup, hash_put, hash_remove_from_table, hash_clear): rehash if needed. (sweep_weak_table): un-staticify; explain logic; bool-ify. (sweep_weak_hash_tables): remove function. * src/font.c (syms_of_font): remember pdumper stuff. * src/fontset.c (syms_of_fontset): remember pdumper stuff. * src/frame.c (make_initial_frame): don't reset Vframe_list. (init_frame_once_for_pdumper, init_frame_once): new functions. (syms_of_frame): remove redundant staticpro. * src/fringe.c (init_fringe_once_for_pdumper): new functin. (init_fringe_once): call it. * src/ftcrfont.c (syms_of_ftcrfont_for_pdumper): new function. (syms_of_ftcrfont): call it. * src/ftfont.c (syms_of_ftfont_for_pdumper): new function. (syms_of_ftfont): call it. * src/ftxont.c (syms_of_ftxfont_for_pdumper): new function. (syms_of_ftxfont): call it. * src/gmalloc.c: adjust for pdumper througout (DUMPED): remove weird custom dumped indicator. * src/gnutls.c (syms_of_gnutls): pdumper note for gnutls_global_initialized. * src/image.c (syms_of_image): add pdumper comment, initializer note. * src/insdel.c (prepare_to_modify_buffer_1): account for buffer contents possibly being in dump image. * src/keyboard.c (syms_of_keyboard_for_pdumper): new function. (syms_of_keyboard): staticpro more; call pdumper syms function. * src/lisp.h: add comments throughout (gflags): declare. (will_dump_p, will_bootstrap_p, will_dump_with_pdumper_p) (dumped_with_pdumper_p, will_dump_with_unexec_p) (dumped_with_unexec_p, definitely_will_not_unexec_p): new functions. (POWER_OF_2, ROUNDUP): move macros. (PSEUDOVECTOR_TYPE, PSEUDOVECTOR_TYPEP): take vectorlike header pointer instead of vector; constify. (Lisp_Hash_Table): add comment about need to rehash on access; add comment for next_weak. (HASH_KEY, HASH_VALUE, HASH_HASH, HASH_TABLE_SIZE): const-ify. (hash_table_rehash): declare. (hash_rehash_needed_p, hash_rehash_if_needed): new functions. (finalizers, doomed_finalizers): declare extern. (SUBR_SECTION_ATTRIBUTE): new macro. (staticvec, staticidx): un-static-ify. (sweep_weak_hash_tables): remove declaration. (sweep_weak_table): declare. (hashfn_eql, hashfn_equal): declare. (number_finalizers_run): new variable. (Vdead): externify when ENABLE_CHECKING. (gc_root_type): new enumeration. (gc_root_visitor): new struct. (visit_static_gc_roots): declare. (vectorlike_nbytes): declare. (vector_nbytes): define as trivial inline function wrapper for vectorlike_nbytes. (init_obarray_once): change signature. (primary_thread): extern-ify. (init_buffer): change signature. (init_frame_once): declare. * src/lread.c (readevalloop): adjust for new dumped predicates. (init_obarray_once): new function. (ndefsubr): new variable. (defsubr): increment it. (load_path_check): adjust for pdumper. (load_path_default): use pdumper functions; adjust for dump search. * src/macfont.m (macfont_init_font_change_handler): avoid shadowing global. (syms_of_macfont_for_pdumper): new function. (syms_of_macfont): call it. * src/menu.c (syms_of_menu): staticpro more stuff. * src/minibuf.c (Ftry_completion): rehash if needed. (init_minibuf_once_for_pdumper): new function. (init_minibuf_once): call it. * src/nsfont.m (syms_of_nsfns): staticpro more. * src/nsfont.m (syms_of_nsfont_for_pdumper): new function. (syms_of_nsfont): call it. * src/nsterm.m (syms_of_nsfont): remember pdumper stuff. * src/pdumper.c: new file. * src/pdumper.h: new file. * src/process.c (init_process_emacs): use new pdumper functions instead of CANNOT_DUMP. * src/profiler.c (syms_of_profiler_for_pdumper): new function. (syms_of_profiler_for_pdumper): call it. * src/search.c (syms_of_search_for_pdumper): new function. (syms_of_search_for_pdumper): call it. * src/sheap.c (bss_sbrk_did_unexec): remove. * src/sheap.h (bss_sbrk_did_unexec): remove. * src/syntax.c (syms_of_syntax): don't redundantly staticpro re_match_object. * src/sysdep.c: use will_dump_with_unexec_p() instead of bss hack thing. * src/syssignals.h (init_sigsegv): declare. * src/systime.h (init_timefns): remove bool from signature. * src/textprop.c (syms_of_textprop): move staticpro. * src/thread.c (main_thread_p): constify. * src/thread.h (main_thread_p): constify. * src/timefns.c (init_timefns): remove bool from signature. (syms_of_timefns_for_pdumper): new function. (syms_of_timefns): call it. * src/w32.c: rearrange code. * src/w32.h (w32_relocate): declare. * src/w32fns.c (syms_of_w32fns): add pdumper note. * src/w32font.c (syms_of_w32font_for_pdumper): new function. (syms_of_w32font): call it. * src/w32heap.c (using_dynamic_heap): new variable. (init_heap): use it. * src/w32menu.c (syms_of_w32menu): add pdumper note. * src/w32proc.c (ctrl_c_handler, mainCRTStartup, _start, open_input_file) (rva_to_section, close_file_data): move here. * src/w32uniscribe.c (syms_of_w32uniscribe_for_pdumper): new function. (syms_of_w32uniscribe): call it. * src/window.c (init_window_once_for_pdumper): new function. (init_window_once): call it; staticpro more stuff. * src/xfont.c (syms_of_xfont_for_pdumper): new function. (syms_of_xfont): call it. * src/xftfont.c (syms_of_xftfont_for_pdumper): new function. (syms_of_xftfont): call it. * src/xmenu.c (syms_of_xmenu_for_pdumper): new function. (syms_of_xmenu): call it. * src/xselect.c (syms_of_xselect_for_pdumper): new function. (syms_of_xselect): call it. * src/xsettings.c (syms_of_xsettings): add more pdumper notes. * src/term.c (syms_of_xterm): add pdumper note. * src/dispnew.c (init_faces_initial): new function. (init_display_interactive): rename from init_display; use will_dump_p instead of !initialized. Initialize faces early for pdumper if needed. (init_display): new function. (syms_of_display_for_pdumper): new function. (syms_of_display): call it. * src/dbusbind.c (syms_of_dbusbind): Add TODO for bus reset on pdumper load. * src/data.c (Fdefalias): Use will_dump_p instead of Vpurify_flag. (Fmake_variable_buffer_local): silence compiler warning with -Og by making valcontents UNINIT. (arith_driver): silence compiler warning with UNINIT. * src/conf_post.h (ATTRIBUTE_SECTION): new macro. * src/composite.c (composition_gstring_put_cache): rehash hash table if needed. * src/coding.c (init_coding_once, syms_of_coding): remember pdumper stuff. * src/charset.h (charset_table_size, charset_table_user): declare. * src/charset.c (charset_table_used, charset_table_size): un-static. (init_charset_oncem, syms_of_charset): remember pdumper stuff. * src/category.c (category_table_version): remove obsolete variable. * src/callint.c (syms_of_callint): staticpro 'preserved_fns' (init_callproc): use will_dump_p instead of !CANNOT_DUMP. * src/bytecode.c (exec_byte_code): rehash table tables if needed * src/buffer.c (alloc_buffer_text, free_buffer_text): account for pdumper (init_buffer_once): add TODO; remember stuff for pdumper. (init_buffer): don't take initialized argument; adjust for pdumper. * src/atimer.c (init_atimer): initialize subr only if !initialized. * src/alloc.c: (vector_marked_p, set_vector_marked) (vectorlike_marked_p, set_vectorlike_marked, cons_marked_p) (set_cons_marked, string_marked_p, set_string_marked) (symbol_marked_p, set_symbol_marked, interval_marked_p) (set_interval_marked): new accessor routines. Use them instead of raw GC access throughout. (Vdead): make non-static when ENABLE_CHECKING. (vectorlike_nbytes): rename of 'vector_nbytes'; take a vectorlike header as input instead of a vector. (number_finalizers_run): new internal C variable. (mark_maybe_object): check for pdumper objects. (valid_pointer_p): don't be gratuitously inefficient under rr(1). (make_pure_c_string): add support for size_byte = -2 mode indicating that string data points into Emacs image rodata. (visit_vectorlike_root): visits GC roots embedded in vectorlike objects. (visit_buffer_root): visits GC roots embedded in our totally-not-a-buffer buffer global objects. (visit_static_gc_roots): visit GC roots in the Emacs data section. (mark_object_root_visitor): root callback used for conventional GC marking (weak_hash_tables): new internal variable for tracking found weak hash tables during GC. (mark_and_sweep_weak_table_contents): new weak hash table marking. (garbage_collect_1): use new GC root visitor machinery. (mark_vectorlike): accept a vectorlike_header instead of a Lisp_Vector. (mark_frame, mark_window, mark_hash_table): new functions. (mark_object): initialize 'm'; check for pdumper objects and use new mark-bit accessors throughout. Remove some object-specific marking code and move to helper functions above. (survives_gc_p): check for pdumper objects. (gc-sweep): clear pdumper mark bits. (init_alloc_once_for_pdumper): new helper function for early init called both during normal init and pdumper load. (init_alloc_once): pdumper integration. * src/Makefile.in: Rewrite dumping for pdumper; add pdumper.o; invoke temacs with --temacs command line option; build dmpstruct.h from dmpstruct.awk; stop relying on CANNOT_DUMP; clean up pdumper intermediate files during build. * nextstep/Makefile.in: build emacs.pdmp into NS packages * lisp/startup.el: account for new '--temacs' and '--dump-file' command line option. * lisp/loadup.el: rewrite early init to account for pdumper; use injected 'dump-mode' variable (set via the new '--temacs' option) instead of parsing command line. * lisp/cus-start.el: Check 'dump-mode' instead of 'purify-flag', since the new 'dump-mode' * lib-src/make-fingerprint.c: new program * lib-src/Makefile.in: built make-fingerprint utility program * configure.ac: Add --with-pdumper toggle to control pdumper support; add --with-unexec toggle to control unexec support. Add --with-dumping option to control which dumping strategy we use by default. Adjust for pdumper throughout. Check for posix_madvise. * Makefile.in: Add @DUMPING@ substitution; add pdumper mode. * .gitignore: Add make-fingerprint, temacs.in, fingerprint.c, dmpstruct.h, and pdumper dump files.
248 lines
8.6 KiB
C
248 lines
8.6 KiB
C
#ifndef EMACS_W32_H
|
|
#define EMACS_W32_H
|
|
|
|
/* Support routines for the NT version of Emacs.
|
|
Copyright (C) 1994, 2001-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Emacs.
|
|
|
|
GNU Emacs 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 3 of the License, or (at
|
|
your option) any later version.
|
|
|
|
GNU Emacs 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 GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
#ifdef CYGWIN
|
|
#error "w32.h is not compatible with Cygwin"
|
|
#endif
|
|
|
|
#include <windows.h>
|
|
|
|
|
|
/* File descriptor set emulation. */
|
|
|
|
/* MSVC runtime library has limit of 64 descriptors by default */
|
|
#define FD_SETSIZE 64
|
|
typedef struct {
|
|
unsigned int bits[FD_SETSIZE / 32];
|
|
} fd_set;
|
|
|
|
/* standard access macros */
|
|
#define FD_SET(n, p) \
|
|
do { \
|
|
if ((n) < FD_SETSIZE) { \
|
|
(p)->bits[(n)/32] |= (1 << (n)%32); \
|
|
} \
|
|
} while (0)
|
|
#define FD_CLR(n, p) \
|
|
do { \
|
|
if ((n) < FD_SETSIZE) { \
|
|
(p)->bits[(n)/32] &= ~(1 << (n)%32); \
|
|
} \
|
|
} while (0)
|
|
#define FD_ISSET(n, p) ((n) < FD_SETSIZE ? ((p)->bits[(n)/32] & (1 << (n)%32)) : 0)
|
|
#define FD_ZERO(p) memset((p), 0, sizeof(fd_set))
|
|
|
|
#define SELECT_TYPE fd_set
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* child_process.status values */
|
|
enum {
|
|
STATUS_READ_ERROR = -1,
|
|
STATUS_READ_READY,
|
|
STATUS_READ_IN_PROGRESS,
|
|
STATUS_READ_FAILED,
|
|
STATUS_READ_SUCCEEDED,
|
|
STATUS_READ_ACKNOWLEDGED,
|
|
STATUS_CONNECT_FAILED
|
|
};
|
|
|
|
/* This structure is used for both pipes and sockets; for
|
|
a socket, the process handle in pi is NULL. */
|
|
typedef struct _child_process
|
|
{
|
|
/* File descriptor for sockets and serial port connections, and for
|
|
reading output from async subprocesses; otherwise -1. */
|
|
int fd;
|
|
/* PID for subprocess, either async or not; otherwise -1. */
|
|
int pid;
|
|
/* Handle to an event object that is signaled when a read operation
|
|
is completed, either successfully (in which case there're indeed
|
|
"characters available") or not. Used by sys_select to wait for
|
|
output from subprocesses or socket/serial connections. */
|
|
HANDLE char_avail;
|
|
/* Handle to an event that is signaled to wake up the reader thread
|
|
and tell it to try reading more output from a subprocess. */
|
|
HANDLE char_consumed;
|
|
/* Handle to the reader thread to read output from a subprocess or a
|
|
socket or a comm port. */
|
|
HANDLE thrd;
|
|
/* Handle to the console window of a subprocess. Used to forcibly
|
|
terminate it by sys_kill. */
|
|
HWND hwnd;
|
|
/* Information about subprocess returned by CreateProcess. Includes
|
|
handles to the subprocess and its main thread, and the
|
|
corresponding process ID and thread ID numbers. The PID is
|
|
mirrored by the 'pid' member above. The process handle is used
|
|
to wait on it. */
|
|
PROCESS_INFORMATION procinfo;
|
|
/* Status of subprocess/connection and of reading its output. For
|
|
values, see the enumeration above. */
|
|
volatile int status;
|
|
/* Used to store errno value of failed async 'connect' calls. */
|
|
volatile int errcode;
|
|
/* Holds a single character read by _sys_read_ahead, when a
|
|
subprocess has some output ready. */
|
|
char chr;
|
|
/* Used for async read operations on serial comm ports. */
|
|
OVERLAPPED ovl_read;
|
|
/* Used for async write operations on serial comm ports. */
|
|
OVERLAPPED ovl_write;
|
|
} child_process;
|
|
|
|
#define MAXDESC FD_SETSIZE
|
|
#define MAX_CHILDREN MAXDESC/2
|
|
#define CHILD_ACTIVE(cp) ((cp)->char_avail != NULL)
|
|
|
|
/* parallel array of private info on file handles */
|
|
typedef struct
|
|
{
|
|
unsigned flags;
|
|
HANDLE hnd;
|
|
child_process * cp;
|
|
} filedesc;
|
|
|
|
extern filedesc fd_info [ MAXDESC ];
|
|
|
|
/* fd_info flag definitions */
|
|
#define FILE_READ 0x0001
|
|
#define FILE_WRITE 0x0002
|
|
#define FILE_LISTEN 0x0004
|
|
#define FILE_CONNECT 0x0008
|
|
#define FILE_BINARY 0x0010
|
|
#define FILE_LAST_CR 0x0020
|
|
#define FILE_AT_EOF 0x0040
|
|
#define FILE_SEND_SIGCHLD 0x0080
|
|
#define FILE_PIPE 0x0100
|
|
#define FILE_SOCKET 0x0200
|
|
#define FILE_NDELAY 0x0400
|
|
#define FILE_SERIAL 0x0800
|
|
|
|
extern child_process * new_child (void);
|
|
extern void delete_child (child_process *cp);
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
/* Equivalent of strerror for W32 error codes. */
|
|
extern char * w32_strerror (int error_no);
|
|
|
|
/* Validate a pointer. */
|
|
extern int w32_valid_pointer_p (void *, int);
|
|
|
|
/* Get long (aka "true") form of file name, if it exists. */
|
|
extern BOOL w32_get_long_filename (const char * name, char * buf, int size);
|
|
|
|
/* Get the short (a.k.a. "8+3") form of a file name. */
|
|
extern unsigned int w32_get_short_filename (const char *, char *, int);
|
|
|
|
/* Prepare our standard handles for proper inheritance by child processes. */
|
|
extern void prepare_standard_handles (int in, int out,
|
|
int err, HANDLE handles[4]);
|
|
|
|
/* Reset our standard handles to their original state. */
|
|
extern void reset_standard_handles (int in, int out,
|
|
int err, HANDLE handles[4]);
|
|
|
|
/* Return the string resource associated with KEY of type TYPE. */
|
|
extern LPBYTE w32_get_resource (const char * key, LPDWORD type);
|
|
|
|
extern void release_listen_threads (void);
|
|
extern void init_ntproc (int);
|
|
extern void term_ntproc (int);
|
|
extern HANDLE maybe_load_unicows_dll (void);
|
|
extern void globals_of_w32 (void);
|
|
|
|
extern void term_timers (void);
|
|
extern void init_timers (void);
|
|
|
|
extern int _sys_read_ahead (int fd);
|
|
extern int _sys_wait_accept (int fd);
|
|
extern int _sys_wait_connect (int fd);
|
|
|
|
extern HMODULE w32_delayed_load (Lisp_Object);
|
|
|
|
typedef int (WINAPI *MultiByteToWideChar_Proc)(UINT,DWORD,LPCSTR,int,LPWSTR,int);
|
|
typedef int (WINAPI *WideCharToMultiByte_Proc)(UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL);
|
|
extern MultiByteToWideChar_Proc pMultiByteToWideChar;
|
|
extern WideCharToMultiByte_Proc pWideCharToMultiByte;
|
|
extern DWORD multiByteToWideCharFlags;
|
|
|
|
extern const char *w32_relocate (const char *);
|
|
|
|
extern void init_environment (char **);
|
|
extern void check_windows_init_file (void);
|
|
extern void syms_of_ntproc (void);
|
|
extern void syms_of_ntterm (void);
|
|
extern void dostounix_filename (register char *);
|
|
extern void unixtodos_filename (register char *);
|
|
extern int filename_from_ansi (const char *, char *);
|
|
extern int filename_to_ansi (const char *, char *);
|
|
extern int filename_from_utf16 (const wchar_t *, char *);
|
|
extern int filename_to_utf16 (const char *, wchar_t *);
|
|
extern Lisp_Object w32_get_internal_run_time (void);
|
|
extern void w32_init_file_name_codepage (void);
|
|
extern int codepage_for_filenames (CPINFO *);
|
|
extern Lisp_Object ansi_encode_filename (Lisp_Object);
|
|
extern int w32_copy_file (const char *, const char *, int, int, int);
|
|
extern int w32_accessible_directory_p (const char *, ptrdiff_t);
|
|
extern void w32_init_current_directory (void);
|
|
|
|
extern BOOL init_winsock (int load_now);
|
|
extern void srandom (int);
|
|
extern int random (void);
|
|
|
|
extern int fchmod (int, mode_t);
|
|
extern int sys_rename_replace (char const *, char const *, BOOL);
|
|
extern int pipe2 (int *, int);
|
|
extern void register_aux_fd (int);
|
|
|
|
extern void set_process_dir (char *);
|
|
extern int sys_spawnve (int, char *, char **, char **);
|
|
extern void register_child (pid_t, int);
|
|
|
|
extern void sys_sleep (int);
|
|
extern int sys_link (const char *, const char *);
|
|
|
|
/* Return total and free memory info. */
|
|
extern int w32_memory_info (unsigned long long *, unsigned long long *,
|
|
unsigned long long *, unsigned long long *);
|
|
|
|
/* Compare 2 UTF-8 strings in locale-dependent fashion. */
|
|
extern int w32_compare_strings (const char *, const char *, char *, int);
|
|
|
|
/* Return a cryptographically secure seed for PRNG. */
|
|
extern int w32_init_random (void *, ptrdiff_t);
|
|
|
|
extern Lisp_Object w32_read_registry (HKEY, Lisp_Object, Lisp_Object);
|
|
|
|
#ifdef HAVE_GNUTLS
|
|
#include <gnutls/gnutls.h>
|
|
|
|
/* GnuTLS pull (read from remote) interface. */
|
|
extern ssize_t emacs_gnutls_pull (gnutls_transport_ptr_t p,
|
|
void* buf, size_t sz);
|
|
|
|
/* GnuTLS push (write to remote) interface. */
|
|
extern ssize_t emacs_gnutls_push (gnutls_transport_ptr_t p,
|
|
const void* buf, size_t sz);
|
|
#endif /* HAVE_GNUTLS */
|
|
|
|
#endif /* EMACS_W32_H */
|