merge trunk

1 files changed, 101 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7922a92d0fc..24d290e163d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,104 @@
+2012-09-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix race conditions with signal handlers and errno.
+        Be more systematic about preserving errno whenever a signal
+        handler returns, even if it's not in the main thread.  Do this by
+        renaming signal handlers to distinguish between signal delivery
+        and signal handling.  All uses changed.
+        * atimer.c (deliver_alarm_signal): Rename from alarm_signal_handler.
+        * data.c (deliver_arith_signal): Rename from arith_error.
+        * dispnew.c (deliver_window_change_signal): Rename from
+        window_change_signal.
+        * emacs.c (deliver_error_signal): Rename from fatal_error_signal.
+        (deliver_danger_signal) [SIGDANGER]: Rename from memory_warning_signal.
+        * keyboard.c (deliver_input_available_signal): Rename from
+        input_available_signal.
+        (deliver_user_signal): Rename from handle_user_signal.
+        (deliver_interrupt_signal): Rename from interrupt_signal.
+        * process.c (deliver_pipe_signal): Rename from send_process_trap.
+        (deliver_child_signal): Rename from sigchld_handler.
+        * atimer.c (handle_alarm_signal):
+        * data.c (handle_arith_signal):
+        * dispnew.c (handle_window_change_signal):
+        * emacs.c (handle_fatal_signal, handle_danger_signal):
+        * keyboard.c (handle_input_available_signal):
+        * keyboard.c (handle_user_signal, handle_interrupt_signal):
+        * process.c (handle_pipe_signal, handle_child_signal):
+        New functions, with the actual signal-handling code taken from the
+        original respective signal handlers, sans the sporadic attempts to
+        preserve errno, since that's now done by handle_on_main_thread.
+        * atimer.c (alarm_signal_handler): Remove unnecessary decl.
+        * emacs.c, floatfns.c, lisp.h: Remove unused FLOAT_CATCH_SIGKILL cruft.
+        * emacs.c (main_thread) [FORWARD_SIGNAL_TO_MAIN_THREAD]:
+        Move to sysdep.c.
+        (main) [FORWARD_SIGNAL_TO_MAIN_THREAD]:
+        Move initialization of main_thread to sysdep.c's init_signals.
+        * process.c (waitpid) [!WNOHANG]: #define to wait; that's good enough for
+        our usage, and simplifies the mainline code.
+        (record_child_status_change): New static function, as a helper
+        for handle_child_signal, and with most of the old child handler's
+        contents.
+        (CAN_HANDLE_MULTIPLE_CHILDREN): New constant.
+        (handle_child_signal): Use the above.
+        * sysdep.c (main_thread) [FORWARD_SIGNAL_TO_MAIN_THREAD]:
+        Moved here from emacs.c.
+        (init_signals) [FORWARD_SIGNAL_TO_MAIN_THREAD]: Initialize it;
+        code moved here from emacs.c's main function.
+        * sysdep.c, syssignal.h (handle_on_main_thread): New function,
+        replacing the old SIGNAL_THREAD_CHECK.  All uses changed.  This
+        lets callers save and restore errno properly.
+
+2012-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Remove redundant or unused things here and there.
+        * lisp.h (CYCLE_CHECK, CHAR_TABLE_TRANSLATE): Remove.
+        * conf_post.h (RE_TRANSLATE): Use char_table_translate.
+        * editfns.c (Fcompare_buffer_substrings): Likewise.
+        * frame.h (struct terminal, struct font_driver_list):
+        Remove redundant declarations.
+        * window.h (Qleft, Qright): Likewise.
+
+2012-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Do not mark objects from deleted buffers, windows and frames.
+        * alloc.c (mark_buffer): Mark just the buffer if it is dead.
+        (mark_object): Likewise for windows and frames.
+
+2012-09-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * alloc.c (valid_lisp_object_p): Treat killed buffers,
+        buffer_defaults and buffer_local_symbols as valid objects.
+        Return special value to denote them.
+
+2012-09-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c, filelock.c, floatfns.c, fns.c: Use bool for boolean.
+        * fileio.c (auto_saving, auto_save_error_occurred, make_temp_name)
+        (Fexpand_file_name, barf_or_query_if_file_exists, Fcopy_file)
+        (file_name_absolute_p, Fsubstitute_in_file_name):
+        (check_executable, check_writable, Ffile_accessible_directory_p)
+        (Fset_file_selinux_context, Fdefault_file_modes)
+        (Finsert_file_contents, choose_write_coding_system)
+        (Fwrite_region, build_annotations, a_write, e_write)
+        (Fdo_auto_save):
+        * filelock.c (boot_time_initialized, get_boot_time)
+        (get_boot_time_1, lock_file_1, within_one_second):
+        * floatfns.c (in_float):
+        * fns.c (concat, internal_equal, Frequire, base64_encode_1)
+        (base64_decode_1, cmpfn_eql, cmpfn_user_defined)
+        (sweep_weak_table, sweep_weak_hash_tables, secure_hash):
+        * lisp.h (struct Lisp_Hash_Table.cmpfn):
+        * window.c (compare_window_configurations):
+        Use bool for booleans.
+        * fileio.c (auto_saving_dir_umask, auto_saving_mode_bits)
+        (Fdefault_file_modes): Now mode_t, not int, for modes.
+        (Fdo_auto_save): Set a boolean to 1 rather than using ++.
+        (internal_delete_file): Now returns void, not a (boolean) int,
+        since nobody was looking at the return value.
+        * lisp.h, window.h: Adjust to above API changes.
+
+        * xdisp.c (set_message): Simplify and reindent last change.
+
 2012-09-05  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in ($(BLD)/sysdep.$(O)): Update dependencies.