Mercurial > hg > xemacs-beta
comparison src/redisplay.c @ 1292:f3437b56874d
[xemacs-hg @ 2003-02-13 09:57:04 by ben]
profile updates
profile.c: Major reworking. Keep track of new information -- total
function timing (includes descendants), GC usage, total GC usage
(includes descendants). New functions to be called appropriately
from eval.c, alloc.c to keep track of this information. Keep track
of when we're actually in a function vs. in its profile, for more
accurate timing counts. Track profile overhead separately. Create
new mechanism for specifying "internal sections" that are tracked
just like regular Lisp functions and even appear in the backtrace
if `backtrace-with-internal-sections' is non-nil (t by default
for error-checking builds). Add some KKCC information for the
straight (non-Elisp) hash table used by profile, which contains
Lisp objects in its keys -- but not used yet. Remove old ad-hoc
methods for tracking garbage collection, redisplay (which was
incorrect anyway when Lisp was called within these sections).
Don't record any tick info when blocking under MS Windows, since
the timer there is in real time rather than in process time.
Make `start-profiling', `stop-profiling' interactive. Be consistent
wrt. recursive functions and functions currently on the stack when
starting or stopping -- together these make implementing the
`total' values extremely difficult. When we start profiling, we
act as if we just entered all the functions currently on the stack.
Likewise when exiting. Create vars in_profile for tracking
time spent inside of profiling, and profiling_lock for setting
exclusive access to the main hash table when reading from it or
modifying it. (protects against getting screwed up by the signal
handle going off at the same time.
profile.h: New file.
Create macros for declaring internal profiling sections.
lisp.h: Move profile-related stuff to profile.h.
alloc.c: Keep track of total consing, for profile.
Tell profile when we are consing.
Use new profile-section method for noting garbage-collection.
alloc.c: Abort if we attempt to call the allocator reentrantly.
backtrace.h, eval.c: Add info for use by profile in the backtrace frame and transfer
PUSH_BACKTRACE/POP_BACKTRACE from eval.c, for use with profile.
elhash.c: Author comment.
eval.c, lisp.h: New Lisp var `backtrace-with-internal-sections'. Set to t when
error-checking is on.
eval.c: When unwinding,
eval.c: Report to profile when we are about-to-call and just-called wrt. a
function.
alloc.c, eval.c: Allow for "fake" backtrace frames, for internal sections (used by
profile and `backtrace-with-internal-sections'.
event-Xt.c, event-gtk.c, event-msw.c, event-tty.c: Record when we are actually blocking on an event, for profile's sake.
event-stream.c: Record internal profiling sections for getting, dispatching events.
extents.c: Record internal profiling sections for map_extents.
hash.c, hash.h: Add pregrow_hash_table_if_necessary(). (Used in profile code
since the signal handler is the main grower but can't allow
a realloc(). We make sure, at critical points, that the table
is large enough.)
lread.c: Create internal profiling sections for `load' (which may be triggered
internally by autoload, etc.).
redisplay.c: Remove old profile_redisplay_flag. Use new macros to declare
internal profiling section for redisplay.
text.c: Use new macros to declare internal profiling sections for
char-byte conversion and internal-external conversion.
SEMI-UNRELATED CHANGES:
-----------------------
text.c: Update the long comments.
author | ben |
---|---|
date | Thu, 13 Feb 2003 09:57:08 +0000 |
parents | cd0abfdb9e9d |
children | b531bf8658e9 |
comparison
equal
deleted
inserted
replaced
1291:3d99b5e6c6ec | 1292:f3437b56874d |
---|---|
67 #include "gutter.h" | 67 #include "gutter.h" |
68 #include "insdel.h" | 68 #include "insdel.h" |
69 #include "menubar.h" | 69 #include "menubar.h" |
70 #include "objects-impl.h" | 70 #include "objects-impl.h" |
71 #include "process.h" | 71 #include "process.h" |
72 #include "profile.h" | |
72 #include "redisplay.h" | 73 #include "redisplay.h" |
73 #include "toolbar.h" | 74 #include "toolbar.h" |
74 #include "window-impl.h" | 75 #include "window-impl.h" |
75 #include "line-number.h" | 76 #include "line-number.h" |
76 #include "file-coding.h" | 77 #include "file-coding.h" |
497 | 498 |
498 Lisp_Object Vleft_margin_width, Vright_margin_width; | 499 Lisp_Object Vleft_margin_width, Vright_margin_width; |
499 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent; | 500 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent; |
500 Lisp_Object Vuse_left_overflow, Vuse_right_overflow; | 501 Lisp_Object Vuse_left_overflow, Vuse_right_overflow; |
501 Lisp_Object Vtext_cursor_visible_p; | 502 Lisp_Object Vtext_cursor_visible_p; |
503 | |
504 static Lisp_Object QSin_redisplay; | |
502 | 505 |
503 int column_number_start_at_one; | 506 int column_number_start_at_one; |
504 | 507 |
505 Lisp_Object Qtop_bottom; | 508 Lisp_Object Qtop_bottom; |
506 | 509 |
6858 static void | 6861 static void |
6859 redisplay_without_hooks (void) | 6862 redisplay_without_hooks (void) |
6860 { | 6863 { |
6861 Lisp_Object devcons, concons; | 6864 Lisp_Object devcons, concons; |
6862 int size_change_failed = 0; | 6865 int size_change_failed = 0; |
6863 int count = specpdl_depth (); | 6866 PROFILE_DECLARE (); |
6864 | 6867 |
6865 if (profiling_active) | 6868 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay); |
6866 internal_bind_int (&profiling_redisplay_flag, 1); | |
6867 | 6869 |
6868 if (asynch_device_change_pending) | 6870 if (asynch_device_change_pending) |
6869 handle_asynch_device_change (); | 6871 handle_asynch_device_change (); |
6870 | 6872 |
6871 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP && | 6873 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP && |
6909 size_changed = 0; | 6911 size_changed = 0; |
6910 | 6912 |
6911 reset_buffer_changes (); | 6913 reset_buffer_changes (); |
6912 | 6914 |
6913 done: | 6915 done: |
6914 unbind_to (count); | |
6915 #ifdef ERROR_CHECK_DISPLAY | 6916 #ifdef ERROR_CHECK_DISPLAY |
6916 sledgehammer_check_redisplay_structs (); | 6917 sledgehammer_check_redisplay_structs (); |
6917 #endif /* ERROR_CHECK_DISPLAY */ | 6918 #endif /* ERROR_CHECK_DISPLAY */ |
6919 | |
6920 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay); | |
6918 } | 6921 } |
6919 | 6922 |
6920 /* Note: All places in the C code that call redisplay() are prepared | 6923 /* Note: All places in the C code that call redisplay() are prepared |
6921 to handle GCing. However, we can't currently handle GC inside the | 6924 to handle GCing. However, we can't currently handle GC inside the |
6922 guts of redisplay (#### someone should fix this), so we need to use | 6925 guts of redisplay (#### someone should fix this), so we need to use |
9653 } | 9656 } |
9654 | 9657 |
9655 void | 9658 void |
9656 vars_of_redisplay (void) | 9659 vars_of_redisplay (void) |
9657 { | 9660 { |
9661 QSin_redisplay = build_msg_string ("(in redisplay)"); | |
9662 staticpro (&QSin_redisplay); | |
9658 | 9663 |
9659 #if 0 | 9664 #if 0 |
9660 staticpro (&last_arrow_position); | 9665 staticpro (&last_arrow_position); |
9661 staticpro (&last_arrow_string); | 9666 staticpro (&last_arrow_string); |
9662 last_arrow_position = Qnil; | 9667 last_arrow_position = Qnil; |