Mercurial > hg > xemacs-beta
annotate lib-src/gnuclient.c @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | c164e88b1977 |
| children | 2161ac78b41e |
| rev | line source |
|---|---|
| 428 | 1 /* -*-C-*- |
| 2 Client code to allow local and remote editing of files by XEmacs. | |
| 3 Copyright (C) 1989 Free Software Foundation, Inc. | |
| 4 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 5 Copyright (C) 1997 Free Software Foundation, Inc. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. | |
| 23 | |
| 24 Author: Andy Norman (ange@hplb.hpl.hp.com), based on | |
| 25 'etc/emacsclient.c' from the GNU Emacs 18.52 distribution. | |
| 26 | |
| 27 Please mail bugs and suggestions to the XEmacs maintainer. | |
| 28 */ | |
| 29 | |
| 442 | 30 /* #### This file should be a windows-mode, not console-mode program under |
| 31 Windows. (i.e. its entry point should be WinMain.) gnuattach functionality, | |
| 32 to the extent it's used at all, should be retrieved using a script that | |
| 33 calls the i.exe wrapper program, to obtain stdio handles. | |
| 34 | |
| 35 #### For that matter, both the functionality of gnuclient and gnuserv | |
| 36 should be merged into XEmacs itself using a -remote arg, just like | |
| 37 Netscape and other modern programs. | |
| 38 | |
| 39 --ben */ | |
| 40 | |
| 428 | 41 /* |
| 42 * This file incorporates new features added by Bob Weiner <weiner@mot.com>, | |
| 43 * Darrell Kindred <dkindred@cmu.edu> and Arup Mukherjee <arup@cmu.edu>. | |
| 44 * GNUATTACH support added by Ben Wing <wing@xemacs.org>. | |
| 45 * Please see the note at the end of the README file for details. | |
| 46 * | |
| 47 * (If gnuserv came bundled with your emacs, the README file is probably | |
| 48 * ../etc/gnuserv.README relative to the directory containing this file) | |
| 49 */ | |
| 50 | |
| 464 | 51 #ifdef CYGWIN |
| 52 extern void cygwin_conv_to_posix_path(const char *path, char *posix_path); | |
| 53 #endif | |
| 54 | |
| 456 | 55 #include "gnuserv.h" |
| 2286 | 56 #include "compiler.h" |
| 428 | 57 |
| 456 | 58 char gnuserv_version[] = "gnuclient version " GNUSERV_VERSION; |
| 59 | |
| 428 | 60 #include "getopt.h" |
| 61 | |
| 62 #include <sysfile.h> | |
| 63 | |
| 64 #if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \ | |
| 65 !defined(INTERNET_DOMAIN_SOCKETS) | |
| 66 int | |
| 67 main (int argc, char *argv[]) | |
| 68 { | |
| 69 fprintf (stderr, "Sorry, the Emacs server is only " | |
| 70 "supported on systems that have\n"); | |
| 71 fprintf (stderr, "Unix Domain sockets, Internet Domain " | |
| 72 "sockets or System V IPC.\n"); | |
| 73 exit (1); | |
| 74 } /* main */ | |
| 75 #else /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */ | |
| 76 | |
| 2424 | 77 static char cwd[QXE_PATH_MAX+2];/* current working directory when calculated */ |
| 428 | 78 static char *cp = NULL; /* ptr into valid bit of cwd above */ |
| 79 | |
| 2424 | 80 static pid_t emacs_pid; /* Process id for emacs process */ |
| 428 | 81 |
| 82 void initialize_signals (void); | |
| 83 | |
| 84 static void | |
| 2286 | 85 tell_emacs_to_resume (int UNUSED (sig)) |
| 428 | 86 { |
| 87 char buffer[GSERV_BUFSZ+1]; | |
| 88 int s; /* socket / msqid to server */ | |
| 89 int connect_type; /* CONN_UNIX, CONN_INTERNET, or | |
| 90 ONN_IPC */ | |
| 91 | |
| 92 /* Why is SYSV so retarded? */ | |
| 93 /* We want emacs to realize that we are resuming */ | |
| 94 #ifdef SIGCONT | |
| 95 signal(SIGCONT, tell_emacs_to_resume); | |
| 96 #endif | |
| 97 | |
| 458 | 98 connect_type = make_connection (NULL, 0, &s); |
| 428 | 99 |
| 100 sprintf(buffer,"(gnuserv-eval '(resume-pid-console %d))", (int)getpid()); | |
| 101 send_string(s, buffer); | |
| 102 | |
| 103 #ifdef SYSV_IPC | |
| 104 if (connect_type == (int) CONN_IPC) | |
| 105 disconnect_from_ipc_server (s, msgp, FALSE); | |
| 106 #else /* !SYSV_IPC */ | |
| 107 if (connect_type != (int) CONN_IPC) | |
| 108 disconnect_from_server (s, FALSE); | |
| 109 #endif /* !SYSV_IPC */ | |
| 110 } | |
| 111 | |
| 112 static void | |
| 113 pass_signal_to_emacs (int sig) | |
| 114 { | |
| 115 if (kill (emacs_pid, sig) == -1) | |
| 116 { | |
| 117 fprintf (stderr, "gnuattach: Could not pass signal to emacs process\n"); | |
| 118 exit (1); | |
| 119 } | |
| 120 initialize_signals (); | |
| 121 } | |
| 122 | |
| 123 void | |
| 442 | 124 initialize_signals (void) |
| 428 | 125 { |
| 126 /* Set up signal handler to pass relevant signals to emacs process. | |
| 127 We used to send SIGSEGV, SIGBUS, SIGPIPE, SIGILL and others to | |
| 128 Emacs, but I think it's better not to. I can see no reason why | |
| 129 Emacs should SIGSEGV whenever gnuclient SIGSEGV-s, etc. */ | |
| 130 signal (SIGQUIT, pass_signal_to_emacs); | |
| 131 signal (SIGINT, pass_signal_to_emacs); | |
| 132 #ifdef SIGWINCH | |
| 133 signal (SIGWINCH, pass_signal_to_emacs); | |
| 134 #endif | |
| 135 | |
| 136 #ifdef SIGCONT | |
| 137 /* We want emacs to realize that we are resuming */ | |
| 138 signal (SIGCONT, tell_emacs_to_resume); | |
| 139 #endif | |
| 140 } | |
| 141 | |
| 142 | |
| 143 /* | |
| 144 get_current_working_directory -- return the cwd. | |
| 145 */ | |
| 146 static char * | |
| 147 get_current_working_directory (void) | |
| 148 { | |
| 149 if (cp == NULL) | |
| 150 { /* haven't calculated it yet */ | |
| 458 | 151 #ifdef HAVE_GETCWD |
| 2424 | 152 if (getcwd (cwd,QXE_PATH_MAX) == NULL) |
| 458 | 153 #else |
| 428 | 154 if (getwd (cwd) == 0) |
| 458 | 155 #endif /* HAVE_GETCWD */ |
| 428 | 156 { |
| 157 perror (progname); | |
| 158 fprintf (stderr, "%s: unable to get current working directory\n", | |
| 159 progname); | |
| 160 exit (1); | |
| 161 } /* if */ | |
| 162 | |
| 163 /* on some systems, cwd can look like '@machine/' ... */ | |
| 164 /* ignore everything before the first '/' */ | |
| 165 for (cp = cwd; *cp && *cp != '/'; ++cp) | |
| 166 ; | |
| 167 | |
| 168 } /* if */ | |
| 169 | |
| 170 return cp; | |
| 171 | |
| 172 } /* get_current_working_directory */ | |
| 173 | |
| 174 | |
| 175 /* | |
| 176 filename_expand -- try to convert the given filename into a fully-qualified | |
| 177 pathname. | |
| 178 */ | |
| 179 static void | |
| 180 filename_expand (char *fullpath, char *filename) | |
| 181 /* fullpath - returned full pathname */ | |
| 182 /* filename - filename to expand */ | |
| 183 { | |
| 464 | 184 #ifdef CYGWIN |
| 2424 | 185 char cygwinFilename[QXE_PATH_MAX+1]; |
| 502 | 186 extern void cygwin_conv_to_posix_path(const char *, char *); |
| 464 | 187 #endif |
| 188 | |
| 428 | 189 int len; |
| 464 | 190 fullpath[0] = '\0'; |
| 428 | 191 |
| 464 | 192 #ifdef CYGWIN |
| 193 /* | |
| 194 If we're in cygwin, just convert it and let the unix stuff handle it. | |
| 195 */ | |
| 196 cygwin_conv_to_posix_path(filename, cygwinFilename); | |
| 197 filename = cygwinFilename; | |
| 198 #endif | |
| 428 | 199 |
| 200 if (filename[0] && filename[0] == '/') | |
| 201 { | |
| 202 /* Absolute (unix-style) pathname. Do nothing */ | |
| 203 strcat (fullpath, filename); | |
| 204 } | |
| 205 else | |
| 206 { | |
| 207 /* Assume relative Unix style path. Get the current directory | |
| 208 and prepend it. FIXME: need to fix the case of DOS paths like | |
| 209 "\foo", where we need to get the current drive. */ | |
| 442 | 210 |
| 428 | 211 strcat (fullpath, get_current_working_directory ()); |
| 212 len = strlen (fullpath); | |
| 213 | |
| 214 if (len > 0 && fullpath[len-1] == '/') /* trailing slash already? */ | |
| 215 ; /* yep */ | |
| 216 else | |
| 217 strcat (fullpath, "/"); /* nope, append trailing slash */ | |
| 218 /* Don't forget to add the filename! */ | |
| 219 strcat (fullpath,filename); | |
| 220 } | |
| 221 } /* filename_expand */ | |
| 222 | |
| 223 /* Encase the string in quotes, escape all the backslashes and quotes | |
| 224 in string. */ | |
| 225 static char * | |
| 442 | 226 clean_string (const char *s) |
| 428 | 227 { |
| 228 int i = 0; | |
| 229 char *p, *res; | |
| 230 | |
| 231 { | |
| 442 | 232 const char *const_p; |
| 428 | 233 for (const_p = s; *const_p; const_p++, i++) |
| 234 { | |
| 235 if (*const_p == '\\' || *const_p == '\"') | |
| 236 ++i; | |
| 237 else if (*const_p == '\004') | |
| 238 i += 3; | |
| 239 } | |
| 240 } | |
| 241 | |
| 242 p = res = (char *) malloc (i + 2 + 1); | |
| 243 *p++ = '\"'; | |
| 244 for (; *s; p++, s++) | |
| 245 { | |
| 246 switch (*s) | |
| 247 { | |
| 248 case '\\': | |
| 249 *p++ = '\\'; | |
| 250 *p = '\\'; | |
| 251 break; | |
| 252 case '\"': | |
| 253 *p++ = '\\'; | |
| 254 *p = '\"'; | |
| 255 break; | |
| 256 case '\004': | |
| 257 *p++ = '\\'; | |
| 258 *p++ = 'C'; | |
| 259 *p++ = '-'; | |
| 260 *p = 'd'; | |
| 261 break; | |
| 262 default: | |
| 263 *p = *s; | |
| 264 } | |
| 265 } | |
| 266 *p++ = '\"'; | |
| 267 *p = '\0'; | |
| 268 return res; | |
| 269 } | |
| 270 | |
| 271 #define GET_ARGUMENT(var, desc) do { \ | |
| 272 if (*(p + 1)) (var) = p + 1; \ | |
| 273 else \ | |
| 274 { \ | |
| 275 if (!argv[++i]) \ | |
| 276 { \ | |
| 277 fprintf (stderr, "%s: `%s' must be followed by an argument\n", \ | |
| 278 progname, desc); \ | |
| 279 exit (1); \ | |
| 280 } \ | |
| 281 (var) = argv[i]; \ | |
| 282 } \ | |
| 283 over = 1; \ | |
| 284 } while (0) | |
| 285 | |
| 440 | 286 /* A strdup imitation. */ |
| 428 | 287 static char * |
| 442 | 288 my_strdup (const char *s) |
| 428 | 289 { |
| 440 | 290 char *new_s = (char *) malloc (strlen (s) + 1); |
| 291 if (new_s) | |
| 292 strcpy (new_s, s); | |
| 293 return new_s; | |
| 428 | 294 } |
| 295 | |
| 296 int | |
| 297 main (int argc, char *argv[]) | |
| 298 { | |
| 299 int starting_line = 1; /* line to start editing at */ | |
| 2424 | 300 char command[QXE_PATH_MAX+50];/* emacs command buffer */ |
| 301 char fullpath[QXE_PATH_MAX+1];/* full pathname to file */ | |
| 428 | 302 char *eval_form = NULL; /* form to evaluate with `-eval' */ |
| 303 char *eval_function = NULL; /* function to evaluate with `-f' */ | |
| 304 char *load_library = NULL; /* library to load */ | |
| 305 int quick = 0; /* quick edit, don't wait for user to | |
| 306 finish */ | |
| 307 int batch = 0; /* batch mode */ | |
| 308 int view = 0; /* view only. */ | |
| 309 int nofiles = 0; | |
| 310 int errflg = 0; /* option error */ | |
| 311 int s; /* socket / msqid to server */ | |
| 312 int connect_type; /* CONN_UNIX, CONN_INTERNET, or | |
| 313 * CONN_IPC */ | |
| 314 int suppress_windows_system = 0; | |
| 315 char *display = NULL; | |
| 316 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 317 char *hostarg = NULL; /* remote hostname */ | |
| 318 char *remotearg; | |
| 319 char thishost[HOSTNAMSZ]; /* this hostname */ | |
| 2424 | 320 char remotepath[QXE_PATH_MAX+1]; /* remote pathname */ |
| 428 | 321 char *path; |
| 322 int rflg = 0; /* pathname given on cmdline */ | |
| 323 char *portarg; | |
| 458 | 324 unsigned short port = 0; /* port to server */ |
| 428 | 325 #endif /* INTERNET_DOMAIN_SOCKETS */ |
| 326 #ifdef SYSV_IPC | |
| 327 struct msgbuf *msgp; /* message */ | |
| 328 #endif /* SYSV_IPC */ | |
| 329 char *tty = NULL; | |
| 330 char buffer[GSERV_BUFSZ + 1]; /* buffer to read pid */ | |
| 331 char result[GSERV_BUFSZ + 1]; | |
| 332 int i; | |
| 333 | |
| 334 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 335 memset (remotepath, 0, sizeof (remotepath)); | |
| 336 #endif /* INTERNET_DOMAIN_SOCKETS */ | |
| 337 | |
| 338 progname = strrchr (argv[0], '/'); | |
| 339 if (progname) | |
| 340 ++progname; | |
| 341 else | |
| 342 progname = argv[0]; | |
| 343 | |
| 771 | 344 #ifdef WIN32_NATIVE |
| 345 tmpdir = getenv ("TEMP"); | |
| 346 if (!tmpdir) | |
| 347 tmpdir = getenv ("TMP"); | |
| 348 if (!tmpdir) | |
| 349 tmpdir = "c:\\"; | |
| 350 #else | |
| 428 | 351 #ifdef USE_TMPDIR |
| 352 tmpdir = getenv ("TMPDIR"); | |
| 353 #endif | |
| 354 if (!tmpdir) | |
| 355 tmpdir = "/tmp"; | |
| 771 | 356 #endif /* WIN32_NATIVE */ |
| 428 | 357 display = getenv ("DISPLAY"); |
| 358 if (display) | |
| 359 display = my_strdup (display); | |
| 360 #ifndef HAVE_MS_WINDOWS | |
| 361 else | |
| 362 suppress_windows_system = 1; | |
| 363 #endif | |
| 364 | |
| 365 for (i = 1; argv[i] && !errflg; i++) | |
| 366 { | |
| 367 if (*argv[i] != '-') | |
| 368 break; | |
| 369 else if (*argv[i] == '-' | |
| 370 && (*(argv[i] + 1) == '\0' | |
| 371 || (*(argv[i] + 1) == '-' && *(argv[i] + 2) == '\0'))) | |
| 372 { | |
| 373 /* `-' or `--' */ | |
| 374 ++i; | |
| 375 break; | |
| 376 } | |
| 377 | |
| 378 if (!strcmp (argv[i], "-batch") || !strcmp (argv[i], "--batch")) | |
| 379 batch = 1; | |
| 380 else if (!strcmp (argv[i], "-eval") || !strcmp (argv[i], "--eval")) | |
| 381 { | |
| 382 if (!argv[++i]) | |
| 383 { | |
| 384 fprintf (stderr, "%s: `-eval' must be followed by an argument\n", | |
| 385 progname); | |
| 386 exit (1); | |
| 387 } | |
| 388 eval_form = argv[i]; | |
| 389 } | |
| 390 else if (!strcmp (argv[i], "-display") || !strcmp (argv[i], "--display")) | |
| 391 { | |
| 392 suppress_windows_system = 0; | |
| 393 if (!argv[++i]) | |
| 394 { | |
| 395 fprintf (stderr, | |
| 396 "%s: `-display' must be followed by an argument\n", | |
| 397 progname); | |
| 398 exit (1); | |
| 399 } | |
| 400 if (display) | |
| 401 free (display); | |
| 402 /* no need to strdup. */ | |
| 403 display = argv[i]; | |
| 404 } | |
| 405 else if (!strcmp (argv[i], "-nw")) | |
| 406 suppress_windows_system = 1; | |
| 407 else | |
| 408 { | |
| 409 /* Iterate over one-letter options. */ | |
| 410 char *p; | |
| 411 int over = 0; | |
| 412 for (p = argv[i] + 1; *p && !over; p++) | |
| 413 { | |
| 414 switch (*p) | |
| 415 { | |
| 416 case 'q': | |
| 417 quick = 1; | |
| 418 break; | |
| 419 case 'v': | |
| 420 view = 1; | |
| 421 break; | |
| 422 case 'f': | |
| 423 GET_ARGUMENT (eval_function, "-f"); | |
| 424 break; | |
| 425 case 'l': | |
| 426 GET_ARGUMENT (load_library, "-l"); | |
| 427 break; | |
| 428 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 429 case 'h': | |
| 430 GET_ARGUMENT (hostarg, "-h"); | |
| 431 break; | |
| 432 case 'p': | |
| 433 GET_ARGUMENT (portarg, "-p"); | |
| 434 port = atoi (portarg); | |
| 435 break; | |
| 436 case 'r': | |
| 437 GET_ARGUMENT (remotearg, "-r"); | |
| 438 strcpy (remotepath, remotearg); | |
| 439 rflg = 1; | |
| 440 break; | |
| 441 #endif /* INTERNET_DOMAIN_SOCKETS */ | |
| 442 default: | |
| 443 errflg = 1; | |
| 444 } | |
| 445 } /* for */ | |
| 446 } /* else */ | |
| 447 } /* for */ | |
| 448 | |
| 449 if (errflg) | |
| 450 { | |
| 451 fprintf (stderr, | |
| 452 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 442 | 453 "Usage: %s [-nw] [-display display] [-q] [-v] [-l library]\n" |
| 428 | 454 " [-batch] [-f function] [-eval form]\n" |
| 455 " [-h host] [-p port] [-r remote-path] [[+line] file] ...\n", | |
| 456 #else /* !INTERNET_DOMAIN_SOCKETS */ | |
| 442 | 457 "Usage: %s [-nw] [-q] [-v] [-l library] [-f function] [-eval form] " |
| 428 | 458 "[[+line] path] ...\n", |
| 459 #endif /* !INTERNET_DOMAIN_SOCKETS */ | |
| 460 progname); | |
| 461 exit (1); | |
| 462 } | |
| 463 if (batch && argv[i]) | |
| 464 { | |
| 465 fprintf (stderr, "%s: Cannot specify `-batch' with file names\n", | |
| 466 progname); | |
| 467 exit (1); | |
| 468 } | |
| 881 | 469 #if defined(INTERNET_DOMAIN_SOCKETS) |
| 428 | 470 if (suppress_windows_system && hostarg) |
| 471 { | |
| 472 fprintf (stderr, "%s: Remote editing is available only on X\n", | |
| 473 progname); | |
| 474 exit (1); | |
| 475 } | |
| 881 | 476 #endif |
| 428 | 477 *result = '\0'; |
| 478 if (eval_function || eval_form || load_library) | |
| 479 { | |
| 480 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 481 connect_type = make_connection (hostarg, port, &s); | |
| 482 #else | |
| 458 | 483 connect_type = make_connection (NULL, 0, &s); |
| 428 | 484 #endif |
| 485 sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : ""); | |
| 486 send_string (s, command); | |
| 487 if (load_library) | |
| 488 { | |
| 489 send_string (s , "(load-library "); | |
| 490 send_string (s, clean_string(load_library)); | |
| 491 send_string (s, ") "); | |
| 492 } | |
| 493 if (eval_form) | |
| 494 { | |
| 495 send_string (s, eval_form); | |
| 496 } | |
| 497 if (eval_function) | |
| 498 { | |
| 499 send_string (s, "("); | |
| 500 send_string (s, eval_function); | |
| 501 send_string (s, ")"); | |
| 502 } | |
| 503 send_string (s, "))"); | |
| 504 /* disconnect already sends EOT_STR */ | |
| 505 #ifdef SYSV_IPC | |
| 506 if (connect_type == (int) CONN_IPC) | |
| 507 disconnect_from_ipc_server (s, msgp, batch && !quick); | |
| 508 #else /* !SYSV_IPC */ | |
| 509 if (connect_type != (int) CONN_IPC) | |
| 510 disconnect_from_server (s, batch && !quick); | |
| 511 #endif /* !SYSV_IPC */ | |
| 512 } /* eval_function || eval_form || load_library */ | |
| 513 else if (batch) | |
| 514 { | |
| 515 /* no sexp on the command line, so read it from stdin */ | |
| 516 int nb; | |
| 517 | |
| 518 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 519 connect_type = make_connection (hostarg, port, &s); | |
| 520 #else | |
| 458 | 521 connect_type = make_connection (NULL, 0, &s); |
| 428 | 522 #endif |
| 523 sprintf (command, "(gnuserv-eval%s '(progn ", quick ? "-quickly" : ""); | |
| 524 send_string (s, command); | |
| 525 | |
| 526 while ((nb = read(fileno(stdin), buffer, GSERV_BUFSZ-1)) > 0) | |
| 527 { | |
| 528 buffer[nb] = '\0'; | |
| 529 send_string(s, buffer); | |
| 530 } | |
| 531 send_string(s,"))"); | |
| 532 /* disconnect already sends EOT_STR */ | |
| 533 #ifdef SYSV_IPC | |
| 534 if (connect_type == (int) CONN_IPC) | |
| 535 disconnect_from_ipc_server (s, msgp, batch && !quick); | |
| 536 #else /* !SYSV_IPC */ | |
| 537 if (connect_type != (int) CONN_IPC) | |
| 538 disconnect_from_server (s, batch && !quick); | |
| 539 #endif /* !SYSV_IPC */ | |
| 540 } | |
| 541 | |
| 542 if (!batch) | |
| 543 { | |
| 544 if (suppress_windows_system) | |
| 545 { | |
| 546 tty = ttyname (0); | |
| 547 if (!tty) | |
| 548 { | |
| 549 fprintf (stderr, "%s: Not connected to a tty", progname); | |
| 550 exit (1); | |
| 551 } | |
| 552 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 553 connect_type = make_connection (hostarg, port, &s); | |
| 554 #else | |
| 458 | 555 connect_type = make_connection (NULL, 0, &s); |
| 428 | 556 #endif |
| 557 send_string (s, "(gnuserv-eval '(emacs-pid))"); | |
| 558 send_string (s, EOT_STR); | |
| 559 | |
| 560 if (read_line (s, buffer) == 0) | |
| 561 { | |
| 562 fprintf (stderr, "%s: Could not establish Emacs process id\n", | |
| 563 progname); | |
| 564 exit (1); | |
| 565 } | |
| 442 | 566 /* Don't do disconnect_from_server because we have already read |
| 428 | 567 data, and disconnect doesn't do anything else. */ |
| 881 | 568 #ifdef SYSV_IPC |
| 428 | 569 if (connect_type == (int) CONN_IPC) |
| 570 disconnect_from_ipc_server (s, msgp, FALSE); | |
| 571 #endif /* !SYSV_IPC */ | |
| 572 | |
| 573 emacs_pid = (pid_t)atol(buffer); | |
| 574 initialize_signals(); | |
| 575 } /* suppress_windows_system */ | |
| 576 | |
| 577 #if defined(INTERNET_DOMAIN_SOCKETS) | |
| 578 connect_type = make_connection (hostarg, port, &s); | |
| 579 #else | |
| 458 | 580 connect_type = make_connection (NULL, 0, &s); |
| 428 | 581 #endif |
| 582 | |
| 583 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 584 if (connect_type == (int) CONN_INTERNET) | |
| 585 { | |
| 586 char *ptr; | |
| 587 gethostname (thishost, HOSTNAMSZ); | |
| 588 if (!rflg) | |
| 589 { /* attempt to generate a path | |
| 590 * to this machine */ | |
| 591 if ((ptr = getenv ("GNU_NODE")) != NULL) | |
| 592 /* user specified a path */ | |
| 593 strcpy (remotepath, ptr); | |
| 594 } | |
| 595 #if 0 /* This is really bogus... re-enable it if you must have it! */ | |
| 596 #if defined (hp9000s300) || defined (hp9000s800) | |
| 597 else if (strcmp (thishost,hostarg)) | |
| 598 { /* try /net/thishost */ | |
| 599 strcpy (remotepath, "/net/"); /* (this fails using internet | |
| 600 addresses) */ | |
| 601 strcat (remotepath, thishost); | |
| 602 } | |
| 603 #endif | |
| 604 #endif | |
| 605 } | |
| 606 else | |
| 607 { /* same machines, no need for path */ | |
| 608 remotepath[0] = '\0'; /* default is the empty path */ | |
| 609 } | |
| 610 #endif /* INTERNET_DOMAIN_SOCKETS */ | |
| 611 | |
| 612 #ifdef SYSV_IPC | |
| 613 if ((msgp = (struct msgbuf *) | |
| 614 malloc (sizeof *msgp + GSERV_BUFSZ)) == NULL) | |
| 615 { | |
| 616 fprintf (stderr, "%s: not enough memory for message buffer\n", progname); | |
| 617 exit (1); | |
| 618 } /* if */ | |
| 619 | |
| 620 msgp->mtext[0] = '\0'; /* ready for later strcats */ | |
| 621 #endif /* SYSV_IPC */ | |
| 622 | |
| 623 if (suppress_windows_system) | |
| 624 { | |
| 625 char *term = getenv ("TERM"); | |
| 626 if (!term) | |
| 627 { | |
| 628 fprintf (stderr, "%s: unknown terminal type\n", progname); | |
| 629 exit (1); | |
| 630 } | |
| 631 sprintf (command, "(gnuserv-edit-files '(tty %s %s %d) '(", | |
| 632 clean_string (tty), clean_string (term), (int)getpid ()); | |
| 633 } | |
| 634 else /* !suppress_windows_system */ | |
| 635 { | |
| 462 | 636 if (0) |
| 637 ; | |
| 638 #ifdef HAVE_X_WINDOWS | |
| 639 else if (display) | |
| 428 | 640 sprintf (command, "(gnuserv-edit-files '(x %s) '(", |
| 641 clean_string (display)); | |
| 462 | 642 #endif |
| 643 #ifdef HAVE_GTK | |
| 644 else if (display) | |
| 645 strcpy (command, "(gnuserv-edit-files '(gtk nil) '("); | |
| 646 #endif | |
| 428 | 647 #ifdef HAVE_MS_WINDOWS |
| 648 else | |
| 649 sprintf (command, "(gnuserv-edit-files '(mswindows nil) '("); | |
| 650 #endif | |
| 651 } /* !suppress_windows_system */ | |
| 652 send_string (s, command); | |
| 653 | |
| 654 if (!argv[i]) | |
| 655 nofiles = 1; | |
| 656 | |
| 657 for (; argv[i]; i++) | |
| 658 { | |
| 659 if (i < argc - 1 && *argv[i] == '+') | |
| 660 starting_line = atoi (argv[i++]); | |
| 661 else | |
| 662 starting_line = 1; | |
| 663 /* If the last argument is +something, treat it as a file. */ | |
| 664 if (i == argc) | |
| 665 { | |
| 666 starting_line = 1; | |
| 667 --i; | |
| 668 } | |
| 669 filename_expand (fullpath, argv[i]); | |
| 670 #ifdef INTERNET_DOMAIN_SOCKETS | |
| 440 | 671 path = (char *) malloc (strlen (remotepath) + strlen (fullpath) + 1); |
| 428 | 672 sprintf (path, "%s%s", remotepath, fullpath); |
| 673 #else | |
| 674 path = my_strdup (fullpath); | |
| 675 #endif | |
| 676 sprintf (command, "(%d . %s)", starting_line, clean_string (path)); | |
| 677 send_string (s, command); | |
| 678 free (path); | |
| 679 } /* for */ | |
| 680 | |
| 681 sprintf (command, ")%s%s", | |
| 682 (quick || (nofiles && !suppress_windows_system)) ? " 'quick" : "", | |
| 683 view ? " 'view" : ""); | |
| 684 send_string (s, command); | |
| 685 send_string (s, ")"); | |
| 686 | |
| 687 #ifdef SYSV_IPC | |
| 688 if (connect_type == (int) CONN_IPC) | |
| 689 disconnect_from_ipc_server (s, msgp, FALSE); | |
| 690 #else /* !SYSV_IPC */ | |
| 691 if (connect_type != (int) CONN_IPC) | |
| 692 disconnect_from_server (s, FALSE); | |
| 693 #endif /* !SYSV_IPC */ | |
| 694 } /* not batch */ | |
| 695 | |
| 696 | |
| 697 return 0; | |
| 698 | |
| 699 } /* main */ | |
| 700 | |
| 701 #endif /* SYSV_IPC || UNIX_DOMAIN_SOCKETS || INTERNET_DOMAIN_SOCKETS */ |