[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.

--- a/src/extents.c	Wed Feb 12 22:52:33 2003 +0000
+++ b/src/extents.c	Thu Feb 13 09:57:08 2003 +0000
@@ -1,6 +1,6 @@
 /* Copyright (c) 1994, 1995 Free Software Foundation, Inc.
    Copyright (c) 1995 Sun Microsystems, Inc.
-   Copyright (c) 1995, 1996, 2000, 2002 Ben Wing.
+   Copyright (c) 1995, 1996, 2000, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -226,6 +226,7 @@
 #include "keymap.h"
 #include "opaque.h"
 #include "process.h"
+#include "profile.h"
 #include "redisplay.h"
 #include "gutter.h"
 
@@ -429,6 +430,9 @@
 #define DE_MUST_BE_ATTACHED 2
 
 Lisp_Object Vlast_highlighted_extent;
+
+Lisp_Object QSin_map_extents_internal;
+
 Fixnum mouse_highlight_priority;
 
 Lisp_Object Qextentp;
@@ -2121,8 +2125,9 @@
   Extent_List_Marker *posm = 0; /* marker for extent list,
 				   if ME_MIGHT_MODIFY_EXTENTS */
   /* count and struct for unwind-protect, if ME_MIGHT_THROW */
-  int count = 0;
+  int count = specpdl_depth ();
   struct map_extents_struct closure;
+  PROFILE_DECLARE ();
 
 #ifdef ERROR_CHECK_EXTENTS
   assert (from <= to);
@@ -2139,10 +2144,12 @@
     }
 
   el = buffer_or_string_extent_list (obj);
-  if (!el || !extent_list_num_els(el))
+  if (!el || !extent_list_num_els (el))
     return;
   el = 0;
 
+  PROFILE_RECORD_ENTERING_SECTION (QSin_map_extents_internal);
+
   st = buffer_or_string_bytexpos_to_memxpos (obj, from);
   en = buffer_or_string_bytexpos_to_memxpos (obj, to);
 
@@ -2166,7 +2173,6 @@
       /* The mapping function might throw past us so we need to use an
 	 unwind_protect() to eliminate the internal extent and range
 	 that we use. */
-      count = specpdl_depth ();
       closure.range = range;
       closure.mkr = 0;
       record_unwind_protect (map_extents_unwind,
@@ -2431,10 +2437,7 @@
   /* ---------- Finished looping. ---------- */
   }
 
-  if (flags & ME_MIGHT_THROW)
-    /* This deletes the range extent and frees the marker. */
-    unbind_to (count);
-  else
+  if (!(flags & ME_MIGHT_THROW))
     {
       /* Delete them ourselves */
       if (range)
@@ -2442,6 +2445,11 @@
       if (posm)
 	extent_list_delete_marker (el, posm);
     }
+
+  /* This deletes the range extent and frees the marker, if ME_MIGHT_THROW. */
+  unbind_to (count);
+
+  PROFILE_RECORD_EXITING_SECTION (QSin_map_extents_internal);
 }
 
 /* ------------------------------- */
@@ -7421,4 +7429,7 @@
   staticpro (&Vextent_face_reverse_memoize_hash_table);
   Vextent_face_reverse_memoize_hash_table =
     make_lisp_hash_table (100, HASH_TABLE_KEY_WEAK, HASH_TABLE_EQ);
-}
+
+  QSin_map_extents_internal = build_msg_string ("(in map-extents-internal)");
+  staticpro (&QSin_map_extents_internal);
+}