diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2019-02-27 01:14:27 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-02-27 01:23:30 -0800 |
commit | e828765d01313acddcf17279b6b43ae9f777f2a4 (patch) | |
tree | 8dd465c5899c62ad5613fe97172fad1ddf419097 /src/profiler.c | |
parent | 2f7885a4b3609dec19e4595c6c24f3a21f33c5d6 (diff) | |
download | emacs-e828765d01313acddcf17279b6b43ae9f777f2a4.tar.gz |
DEFVAR_INT variables are now intmax_t
Formerly they were fixnums, which led to problems when dealing
with values that might not fit on 32-bit platforms, such as
string-chars-consed or floats_consed. 64-bit counters should
be good enough for these (for a while, anyway...).
While we’re at it, fix some unlikely integer overflow bugs
that have been in the code for a while.
* lib-src/make-docfile.c (write_globals):
* src/data.c (do_symval_forwarding, store_symval_forwarding):
* src/eval.c (restore_stack_limits, call_debugger):
* src/frame.h (struct frame.cost_calculation_baud_rate):
* src/keyboard.c (last_auto_save, bind_polling_period, read_char):
* src/lisp.h (struct Lisp_Intfwd.intvar):
* src/lread.c (defvar_int):
* src/pdumper.c (dump_fwd_int):
* src/thread.h (struct thread_state.m_lisp_eval_depth):
* src/undo.c (truncate_undo_list):
* src/xselect.c (wait_for_property_change)
(x_get_foreign_selection):
* src/xterm.c (x_emacs_to_x_modifiers):
DEFVAR_INT variables now have the C type intmax_t, not EMACS_INT.
* src/data.c (store_symval_forwarding):
* src/gnutls.c (Fgnutls_boot):
* src/keyboard.c (bind_polling_period):
* src/macros.c (pop_kbd_macro, Fexecute_kbd_macro):
* src/undo.c (truncate_undo_list):
Allow any integer that fits into intmax_t, instead of
requiring it to be a Lisp fixnum.
* src/dispnew.c (update_window):
* src/frame.c (x_figure_window_size):
* src/gnutls.c (init_gnutls_functions)
(emacs_gnutls_handle_error):
* src/keyboard.c (make_lisp_event):
* src/nsterm.m (ns_dumpglyphs_image):
* src/profiler.c (make_log):
* src/scroll.c (calculate_scrolling)
(calculate_direct_scrolling):
* src/termcap.c (tputs):
* src/xterm.c (x_draw_image_relief):
Avoid implementation-defined behavior on conversion of
out-of-range integers.
* src/eval.c (when_entered_debugger): Now intmax_t.
(max_ensure_room): New function, that avoids signed integer overflow.
(call_debugger, signal_or_quit): Use it.
* src/fileio.c (Fdo_auto_save):
* src/keyboard.c (make_lisp_event):
* src/term.c (calculate_costs):
* src/xdisp.c (build_desired_tool_bar_string)
(hscroll_window_tree, try_scrolling, decode_mode_spec)
(x_produce_glyphs):
Avoid signed integer overflow.
* src/lisp.h (clip_to_bounds): Generalize to intmax_t.
* src/pdumper.c (dump_emacs_reloc_immediate_emacs_int): Remove, ...
(dump_emacs_reloc_immediate_intmax_t): ... replacing with this
function. All uses changed.
* src/profiler.c (make_log): Omit args. All callers changed.
* src/termcap.c: Include stdlib.h, for atoi.
Include intprops.h.
* src/window.c (sanitize_next_screen_context_lines): New function.
(window_scroll_pixel_based, window_scroll_line_based):
Use it to avoid signed integer overflow.
Diffstat (limited to 'src/profiler.c')
-rw-r--r-- | src/profiler.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/profiler.c b/src/profiler.c index 2aa5f345740..87be30acc30 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -52,12 +52,16 @@ static const struct hash_table_test hashtest_profiler = }; static Lisp_Object -make_log (EMACS_INT heap_size, EMACS_INT max_stack_depth) +make_log (void) { /* We use a standard Elisp hash-table object, but we use it in a special way. This is OK as long as the object is not exposed to Elisp, i.e. until it is returned by *-profiler-log, after which it can't be used any more. */ + EMACS_INT heap_size + = clip_to_bounds (0, profiler_log_size, MOST_POSITIVE_FIXNUM); + ptrdiff_t max_stack_depth + = clip_to_bounds (0, profiler_max_stack_depth, PTRDIFF_MAX);; Lisp_Object log = make_hash_table (hashtest_profiler, heap_size, DEFAULT_REHASH_SIZE, DEFAULT_REHASH_THRESHOLD, @@ -342,8 +346,7 @@ See also `profiler-log-size' and `profiler-max-stack-depth'. */) if (NILP (cpu_log)) { cpu_gc_count = 0; - cpu_log = make_log (profiler_log_size, - profiler_max_stack_depth); + cpu_log = make_log (); } int status = setup_cpu_timer (sampling_interval); @@ -419,9 +422,7 @@ Before returning, a new log is allocated for future samples. */) /* Here we're making the log visible to Elisp, so it's not safe any more for our use afterwards since we can't rely on its special pre-allocated keys anymore. So we have to allocate a new one. */ - cpu_log = (profiler_cpu_running - ? make_log (profiler_log_size, profiler_max_stack_depth) - : Qnil); + cpu_log = profiler_cpu_running ? make_log () : Qnil; Fputhash (make_vector (1, QAutomatic_GC), make_fixnum (cpu_gc_count), result); @@ -450,8 +451,7 @@ See also `profiler-log-size' and `profiler-max-stack-depth'. */) error ("Memory profiler is already running"); if (NILP (memory_log)) - memory_log = make_log (profiler_log_size, - profiler_max_stack_depth); + memory_log = make_log (); profiler_memory_running = true; @@ -494,9 +494,7 @@ Before returning, a new log is allocated for future samples. */) /* Here we're making the log visible to Elisp , so it's not safe any more for our use afterwards since we can't rely on its special pre-allocated keys anymore. So we have to allocate a new one. */ - memory_log = (profiler_memory_running - ? make_log (profiler_log_size, profiler_max_stack_depth) - : Qnil); + memory_log = profiler_memory_running ? make_log () : Qnil; return result; } |